Skip to content

Commit 78c0dd0

Browse files
committed
naming: typo fixes and renames
1 parent 700ce40 commit 78c0dd0

6 files changed

Lines changed: 17 additions & 15 deletions

File tree

arch/x86_64/acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void acpi_print_madt(acpi_madt_t *madt) {
122122
"\t\tflags: %#06hX\n"
123123
"\t\tlint number: %hhu\n",
124124
entry->nmi.processor_id, entry->nmi.flags,
125-
entry->nmi.LINT_number);
125+
entry->nmi.lint_number);
126126
break;
127127
case MADT_ENTRY_LAPIC_ADDRESS:
128128
printf(

include/netinet/hdr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ struct __PACKED udp_hdr {
7474
uint16_t checksum;
7575
};
7676

77-
struct __PACKED udp_ip_psuedo_hdr {
77+
struct __PACKED udp_ip_pseudo_hdr {
7878
struct in_addr src;
7979
struct in_addr dest;
8080
uint8_t zero;

include/netinet/in.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enum {
5050
IPPROTO_ICMP = 1,
5151
IPPROTO_TCP = 6,
5252
IPPROTO_UDP = 17,
53-
IPPRTOTO_IPV6 = 41,
53+
IPPROTO_IPV6 = 41,
5454
IPPROTO_RAW = 255,
5555
};
5656

kernel/include/ng/x86/acpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef struct __PACKED acpi_madt_iso {
5858
typedef struct __PACKED acpi_madt_nmi {
5959
unsigned char processor_id;
6060
uint16_t flags;
61-
unsigned char LINT_number;
61+
unsigned char lint_number;
6262
} acpi_madt_nmi_t;
6363

6464
typedef struct __PACKED acpi_madt_lapic_address {

kernel/net/debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void net_debug_udp_echo(struct pk *pk) {
230230

231231
reply_ip->checksum = net_checksum((uint16_t *)reply_ip, sizeof(*reply_ip));
232232

233-
struct udp_ip_psuedo_hdr pseudo = {
233+
struct udp_ip_pseudo_hdr pseudo = {
234234
.src = reply_ip->src,
235235
.dest = reply_ip->dest,
236236
.zero = 0,

libc/printf.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ int puts(const char *str) {
2121
}
2222

2323
// Formats for printf
24-
typedef enum Format {
24+
typedef enum printf_format {
2525
NORMAL,
2626
HEX,
2727
UPPER_HEX,
2828
OCTAL,
2929
BINARY,
3030
POINTER,
31-
} Format;
31+
} printf_format;
3232

33-
typedef struct Format_Info {
33+
typedef struct printf_format_info {
3434
int bytes;
35-
Format format;
35+
printf_format format;
3636
bool is_signed;
3737
bool alternate_format;
3838
bool print_plus;
@@ -46,9 +46,10 @@ typedef struct Format_Info {
4646
} direction;
4747
char c;
4848
} pad;
49-
} Format_Info;
49+
} printf_format_info;
5050

51-
static size_t format_int(char *buf, uint64_t raw_value, Format_Info fmt) {
51+
static size_t format_int(
52+
char *buf, uint64_t raw_value, printf_format_info fmt) {
5253
int base = 0;
5354
const char *charset = __lower_hex_charset;
5455

@@ -241,8 +242,8 @@ static size_t format_int(char *buf, uint64_t raw_value, Format_Info fmt) {
241242
}
242243
}
243244

244-
ssize_t format_string(
245-
Format_Info format, bool constrain_string_len, const char *str, char *buf) {
245+
ssize_t format_string(printf_format_info format, bool constrain_string_len,
246+
const char *str, char *buf) {
246247
ssize_t buf_ix = 0;
247248

248249
if (format.pad.len || constrain_string_len) {
@@ -285,7 +286,8 @@ ssize_t format_string(
285286
return buf_ix;
286287
}
287288

288-
static size_t format_float(char *buf, double raw_value, Format_Info fmt) {
289+
static size_t format_float(
290+
char *buf, double raw_value, printf_format_info fmt) {
289291
long int_part = (long)raw_value;
290292
long fractional_part = labs((long)(raw_value * 1000) % 1000);
291293

@@ -318,7 +320,7 @@ int vsprintf(char *buf, const char *fmt, va_list args) {
318320
bool do_print_int = false;
319321
bool do_print_float = false;
320322
bool constrain_string_len = false;
321-
Format_Info format = {
323+
printf_format_info format = {
322324
.bytes = 4,
323325
.is_signed = false,
324326
.alternate_format = false,

0 commit comments

Comments
 (0)