Skip to content

Commit 5baa1a9

Browse files
coderarjobcoderarjob
committed
cm: Append 'cm' to vsnprintf, snprintf lib functions
To be inline with the current naming convention.
1 parent 55f2ab5 commit 5baa1a9

File tree

4 files changed

+52
-54
lines changed

4 files changed

+52
-54
lines changed

‎include/cm/cm.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#define INVALID_HANDLE (-1)
2222
#define HALT() for (;;)
2323

24-
INT snprintf (CHAR* dest, size_t size, const CHAR* fmt, ...);
25-
INT vsnprintf (CHAR* dest, size_t size, const CHAR* fmt, va_list l);
24+
INT cm_snprintf (CHAR* dest, size_t size, const CHAR* fmt, ...);
25+
INT cm_vsnprintf (CHAR* dest, size_t size, const CHAR* fmt, va_list l);
2626

2727
/***************************************************************************************************
2828
* Misc functions

‎src/cm/debug.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ void cm_debug_log_ndu (CM_DebugLogType type, const char* func, UINT line, char*
6969
}
7070

7171
UINT tick_count = cm_get_tickcount();
72-
len = snprintf (buffer, ARRAY_LENGTH (buffer), message, logColor, tick_count, ANSI_COL_GRAY,
73-
func, line, ANSI_COL_RESET);
72+
len = cm_snprintf (buffer, ARRAY_LENGTH (buffer), message, logColor, tick_count, ANSI_COL_GRAY,
73+
func, line, ANSI_COL_RESET);
7474

7575
va_list l;
7676
va_start (l, fmt);
77-
vsnprintf (buffer + len, ARRAY_LENGTH (buffer), fmt, l);
77+
cm_vsnprintf (buffer + len, ARRAY_LENGTH (buffer), fmt, l);
7878
va_end (l);
7979

8080
qemu_putString (buffer);

‎src/cm/printf.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ static U64 s_readint (IntTypes inttype, va_list* l);
2828
* Conversion attributes are given in the following format:
2929
* %[ type modifiers : l|ll|p ] [ conversions: u|h|x|o|s|b|% ]
3030
*
31-
* For format details, see description for `kearly_vsnprintf`.
31+
* For format details, see description for `cm_vsnprintf`.
3232
* @param ... Arguments for each conversion specification.
33-
* @return For description for `kearly_vsnprintf`.
33+
* @return For description for `cm_vsnprintf`.
3434
**************************************************************************************************/
35-
INT snprintf (CHAR* dest, size_t size, const CHAR* fmt, ...)
35+
INT cm_snprintf (CHAR* dest, size_t size, const CHAR* fmt, ...)
3636
{
3737
va_list l;
3838
va_start (l, fmt);
3939

40-
INT len = vsnprintf (dest, size, fmt, l);
40+
INT len = cm_vsnprintf (dest, size, fmt, l);
4141
va_end (l);
4242

4343
return len;
@@ -78,7 +78,7 @@ INT snprintf (CHAR* dest, size_t size, const CHAR* fmt, ...)
7878
* written to the final string if enough space had been available.
7979
* A return value of size or more means that the output was truncated
8080
**************************************************************************************************/
81-
INT vsnprintf (CHAR* dest, size_t size, const CHAR* fmt, va_list l)
81+
INT cm_vsnprintf (CHAR* dest, size_t size, const CHAR* fmt, va_list l)
8282
{
8383
size_t originalsize = size;
8484
S64 size_left = size;

‎src/unittests/cm/printf_test.c‎

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,198 +1,196 @@
11
#include <unittest/unittest.h>
22
#include <types.h>
33
#include <moslimits.h>
4-
#include <kdebug.h>
5-
#include <string.h>
6-
#include <stdio.h>
74
#include <utils.h>
8-
#include <kernel.h>
5+
#include <string.h>
6+
#include <cm/cm.h>
97

10-
TEST(snprintf, no_vargs)
8+
TEST(cm_snprintf, no_vargs)
119
{
1210
#define MESSAGE "Hello world"
1311
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
14-
INT ret = snprintf (d, ARRAY_LENGTH(d), MESSAGE);
12+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), MESSAGE);
1513
EQ_SCALAR(ret, 11);
1614
EQ_SCALAR(ret, strlen(MESSAGE));
1715
EQ_STRING(d, MESSAGE);
1816
END();
1917
}
2018

21-
TEST(snprintf, unsigned_int_bit_format)
19+
TEST(cm_snprintf, unsigned_int_bit_format)
2220
{
2321
INT num = 0xFF01;
2422
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
25-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%b", num);
23+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%b", num);
2624
EQ_SCALAR(ret, 17);
2725
EQ_STRING(d, "1111111100000001b");
2826
END();
2927
}
3028

31-
TEST(snprintf, unsigned_int_decimal_format)
29+
TEST(cm_snprintf, unsigned_int_decimal_format)
3230
{
3331
INT num = 1045;
3432
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
35-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%u", num);
33+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%u", num);
3634
EQ_SCALAR(ret, 4);
3735
EQ_STRING(d, "1045");
3836
END();
3937
}
4038

41-
TEST(snprintf, unsigned_int_hex_format_without_base_identifier)
39+
TEST(cm_snprintf, unsigned_int_hex_format_without_base_identifier)
4240
{
4341
INT num = 0x123def;
4442
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
45-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%h", num);
43+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%h", num);
4644
EQ_SCALAR(ret, 6);
4745
EQ_STRING(d, "123DEF");
4846
END();
4947
}
5048

51-
TEST(snprintf, unsigned_int_hex_format)
49+
TEST(cm_snprintf, unsigned_int_hex_format)
5250
{
5351
INT num = 0x123def;
5452
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
55-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%x", num);
53+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%x", num);
5654
EQ_SCALAR(ret, 7);
5755
EQ_STRING(d, "123DEFh");
5856
END();
5957
}
6058

61-
TEST(snprintf, unsigned_int_octal_format)
59+
TEST(cm_snprintf, unsigned_int_octal_format)
6260
{
6361
INT num = 07210;
6462
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
65-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%o", num);
63+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%o", num);
6664
EQ_SCALAR(ret, 5);
6765
EQ_STRING(d, "7210o");
6866
END();
6967
}
7068

71-
TEST(snprintf, unsigned_long_hex_format)
69+
TEST(cm_snprintf, unsigned_long_hex_format)
7270
{
7371
U32 num = 0xCF010203;
7472
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
75-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%lx", num);
73+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%lx", num);
7674
EQ_SCALAR(ret, 9);
7775
EQ_STRING(d, "CF010203h");
7876
END();
7977
}
80-
TEST(snprintf, unsigned_long_long_hex_format)
78+
TEST(cm_snprintf, unsigned_long_long_hex_format)
8179
{
8280
U64 num = 0xCF010203040506FF;
8381
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
84-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%llx", num);
82+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%llx", num);
8583
EQ_SCALAR(ret, 17);
8684
EQ_STRING(d, "CF010203040506FFh");
8785
END();
8886
}
8987

90-
TEST(snprintf, limit_check_empty_string)
88+
TEST(cm_snprintf, limit_check_empty_string)
9189
{
9290
CHAR *message = "";
9391
CHAR d[1];
94-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%s", message);
92+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%s", message);
9593
EQ_SCALAR(ret, 0);
9694
EQ_STRING(d, "");
9795
END();
9896
}
9997

100-
TEST(snprintf, limit_check_at_edge)
98+
TEST(cm_snprintf, limit_check_at_edge)
10199
{
102100
CHAR *message = "aaa"; // 3 'a's. NULL at index 3.
103101
CHAR d[4];
104102

105-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%s", message);
103+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%s", message);
106104
EQ_SCALAR(ret, 3);
107105
EQ_STRING(d, message);
108106
END();
109107
}
110108

111-
TEST(snprintf, limit_check_overflow_literal)
109+
TEST(cm_snprintf, limit_check_overflow_literal)
112110
{
113111
#define MESSAGE "Hello world"
114112
CHAR d[8];
115-
INT ret = snprintf (d, ARRAY_LENGTH(d), MESSAGE);
113+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), MESSAGE);
116114
EQ_SCALAR(ret, 11);
117115
EQ_STRING(d, "Hello w");
118116
END();
119117
}
120118

121-
TEST(snprintf, limit_check_overflow_string_format)
119+
TEST(cm_snprintf, limit_check_overflow_string_format)
122120
{
123121
CHAR *message = "Hello world";
124122
CHAR d[8];
125-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%s", message);
123+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%s", message);
126124
EQ_SCALAR(ret, 11);
127125
EQ_STRING(d, "Hello w");
128126
END();
129127
}
130128

131-
TEST(snprintf, limit_check_overflow_unsigned_int)
129+
TEST(cm_snprintf, limit_check_overflow_unsigned_int)
132130
{
133131
INT num = 0xFF012EA;
134132
CHAR d[4];
135-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%x", num);
133+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%x", num);
136134
EQ_SCALAR(ret, 8);
137135
EQ_STRING(d, "FF0");
138136
END();
139137
}
140138

141-
TEST(snprintf, limit_check_overflow_mixed)
139+
TEST(cm_snprintf, limit_check_overflow_mixed)
142140
{
143141
INT num = 0xFF012EA;
144142
CHAR d[15];
145-
INT ret = snprintf (d, ARRAY_LENGTH(d), "Hello %s %x",
143+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "Hello %s %x",
146144
"World", num);
147145
EQ_SCALAR(ret, 20);
148146
EQ_STRING(d, "Hello World FF");
149147
END();
150148
}
151149

152-
TEST(snprintf, percent_symbol)
150+
TEST(cm_snprintf, percent_symbol)
153151
{
154152
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
155-
INT ret = snprintf (d, ARRAY_LENGTH(d), "100%%");
153+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "100%%");
156154
EQ_SCALAR(ret, 4);
157155
EQ_STRING(d, "100%");
158156
END();
159157
}
160158

161-
TEST(snprintf, wrong_format)
159+
TEST(cm_snprintf, wrong_format)
162160
{
163-
// %a is not a valid format. snprintf should treat this to be a literal.
161+
// %a is not a valid format. cm_snprintf should treat this to be a literal.
164162
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
165-
INT ret = snprintf (d, ARRAY_LENGTH(d), "Hello %arjob");
163+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "Hello %arjob");
166164
EQ_SCALAR(ret, 12);
167165
EQ_STRING(d, "Hello %arjob");
168166
END();
169167
}
170168

171-
TEST(snprintf, string_literal)
169+
TEST(cm_snprintf, string_literal)
172170
{
173171
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
174-
INT ret = snprintf (d, ARRAY_LENGTH(d), "Arjob 0x10A");
172+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "Arjob 0x10A");
175173
EQ_SCALAR(ret, 11);
176174
EQ_STRING(d, "Arjob 0x10A");
177175
END();
178176
}
179177

180-
TEST(snprintf, memory_overlap)
178+
TEST(cm_snprintf, memory_overlap)
181179
{
182180
CHAR d[MAX_PRINTABLE_STRING_LENGTH];
183-
INT ret1 = snprintf (d, ARRAY_LENGTH(d), "Hello");
184-
INT ret2 = snprintf (d, ARRAY_LENGTH(d), "%s World", d);
181+
INT ret1 = cm_snprintf (d, ARRAY_LENGTH(d), "Hello");
182+
INT ret2 = cm_snprintf (d, ARRAY_LENGTH(d), "%s World", d);
185183
EQ_SCALAR(ret1, 5);
186184
EQ_SCALAR(ret2, 5 + 1 + 5);
187185
EQ_STRING(d, "Hello World");
188186
END();
189187
}
190188

191-
TEST(snprintf, pointer_literal)
189+
TEST(cm_snprintf, pointer_literal)
192190
{
193191
USYSINT num = 0xFF012EA;
194192
CHAR d[10];
195-
INT ret = snprintf (d, ARRAY_LENGTH(d), "%px", num);
193+
INT ret = cm_snprintf (d, ARRAY_LENGTH(d), "%px", num);
196194
EQ_SCALAR(ret, 8);
197195
EQ_STRING(d, "FF012EAh");
198196
END();

0 commit comments

Comments
 (0)