yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make my_str_len/my_itos take uintmax_t

Browse source 
R=digit at https://breakpad.appspot.com/452004/

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1038 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek@gmail.com 2012-09-17 14:01:19 +00:00
parent 54ede03227
commit a61c7e6927
4 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/linux/minidump_writer/linux_ptrace_dumper.cc
View file

@ -112,13 +112,13 @@ bool LinuxPtraceDumper::BuildProcPath(char* path, pid_t pid,
if (node_len == 0) if (node_len == 0)
return false; return false;
const unsigned pid_len = my_int_len(pid); const unsigned pid_len = my_uint_len(pid);
const size_t total_length = 6 + pid_len + 1 + node_len; const size_t total_length = 6 + pid_len + 1 + node_len;
if (total_length >= NAME_MAX) if (total_length >= NAME_MAX)
return false; return false;
my_memcpy(path, "/proc/", 6); my_memcpy(path, "/proc/", 6);
my_itos(path + 6, pid, pid_len); my_uitos(path + 6, pid, pid_len);
path[6 + pid_len] = '/'; path[6 + pid_len] = '/';
my_memcpy(path + 6 + pid_len + 1, node, node_len); my_memcpy(path + 6 + pid_len + 1, node, node_len);
path[total_length] = '\0'; path[total_length] = '\0';

15
src/common/linux/linux_libc_support.cc
View file

@ -95,9 +95,8 @@ bool my_strtoui(int* result, const char* s) {
return true; return true;
} }
// Return the length of the given, non-negative integer when expressed in base // Return the length of the given unsigned integer when expressed in base 10.
// 10. unsigned my_uint_len(uintmax_t i) {
unsigned my_int_len(intmax_t i) {
if (!i) if (!i)
return 1; return 1;
@ -110,13 +109,13 @@ unsigned my_int_len(intmax_t i) {
return len; return len;
} }
// Convert a non-negative integer to a string // Convert an unsigned integer to a string
// output: (output) the resulting string is written here. This buffer must be // output: (output) the resulting string is written here. This buffer must be
// large enough to hold the resulting string. Call |my_int_len| to get the // large enough to hold the resulting string. Call |my_uint_len| to get the
// required length. // required length.
// i: the non-negative integer to serialise. // i: the unsigned integer to serialise.
// i_len: the length of the integer in base 10 (see |my_int_len|). // i_len: the length of the integer in base 10 (see |my_uint_len|).
void my_itos(char* output, intmax_t i, unsigned i_len) { void my_uitos(char* output, uintmax_t i, unsigned i_len) {
for (unsigned index = i_len; index; --index, i /= 10) for (unsigned index = i_len; index; --index, i /= 10)
output[index - 1] = '0' + (i % 10); output[index - 1] = '0' + (i % 10);
} }

13
src/common/linux/linux_libc_support.h
View file

@ -52,17 +52,16 @@ extern int my_strncmp(const char* a, const char* b, size_t len);
// Return true iff successful. // Return true iff successful.
extern bool my_strtoui(int* result, const char* s); extern bool my_strtoui(int* result, const char* s);
// Return the length of the given, non-negative integer when expressed in base // Return the length of the given unsigned integer when expressed in base 10.
// 10. extern unsigned my_uint_len(uintmax_t i);
extern unsigned my_int_len(intmax_t i);
// Convert a non-negative integer to a string // Convert an unsigned integer to a string
// output: (output) the resulting string is written here. This buffer must be // output: (output) the resulting string is written here. This buffer must be
// large enough to hold the resulting string. Call |my_int_len| to get the // large enough to hold the resulting string. Call |my_int_len| to get the
// required length. // required length.
// i: the non-negative integer to serialise. // i: the unsigned integer to serialise.
// i_len: the length of the integer in base 10 (see |my_int_len|). // i_len: the length of the integer in base 10 (see |my_uint_len|).
extern void my_itos(char* output, intmax_t i, unsigned i_len); extern void my_uitos(char* output, uintmax_t i, unsigned i_len);
extern const char* my_strchr(const char* haystack, char needle); extern const char* my_strchr(const char* haystack, char needle);

40
src/common/linux/linux_libc_support_unittest.cc
View file

@ -89,35 +89,41 @@ TEST(LinuxLibcSupportTest, strtoui) {
ASSERT_EQ(result, 123); ASSERT_EQ(result, 123);
} }
TEST(LinuxLibcSupportTest, int_len) { TEST(LinuxLibcSupportTest, uint_len) {
ASSERT_EQ(my_int_len(0), 1); ASSERT_EQ(my_uint_len(0), 1);
ASSERT_EQ(my_int_len(2), 1); ASSERT_EQ(my_uint_len(2), 1);
ASSERT_EQ(my_int_len(5), 1); ASSERT_EQ(my_uint_len(5), 1);
ASSERT_EQ(my_int_len(9), 1); ASSERT_EQ(my_uint_len(9), 1);
ASSERT_EQ(my_int_len(10), 2); ASSERT_EQ(my_uint_len(10), 2);
ASSERT_EQ(my_int_len(99), 2); ASSERT_EQ(my_uint_len(99), 2);
ASSERT_EQ(my_int_len(100), 3); ASSERT_EQ(my_uint_len(100), 3);
ASSERT_EQ(my_int_len(101), 3); ASSERT_EQ(my_uint_len(101), 3);
ASSERT_EQ(my_int_len(1000), 4); ASSERT_EQ(my_uint_len(1000), 4);
// 0xFFFFFFFFFFFFFFFF
ASSERT_EQ(my_uint_len(18446744073709551615LLU), 20);
} }
TEST(LinuxLibcSupportTest, itos) { TEST(LinuxLibcSupportTest, uitos) {
char buf[10]; char buf[32];
my_itos(buf, 0, 1); my_uitos(buf, 0, 1);
ASSERT_EQ(0, memcmp(buf, "0", 1)); ASSERT_EQ(0, memcmp(buf, "0", 1));
my_itos(buf, 1, 1); my_uitos(buf, 1, 1);
ASSERT_EQ(0, memcmp(buf, "1", 1)); ASSERT_EQ(0, memcmp(buf, "1", 1));
my_itos(buf, 10, 2); my_uitos(buf, 10, 2);
ASSERT_EQ(0, memcmp(buf, "10", 2)); ASSERT_EQ(0, memcmp(buf, "10", 2));
my_itos(buf, 63, 2); my_uitos(buf, 63, 2);
ASSERT_EQ(0, memcmp(buf, "63", 2)); ASSERT_EQ(0, memcmp(buf, "63", 2));
my_itos(buf, 101, 3); my_uitos(buf, 101, 3);
ASSERT_EQ(0, memcmp(buf, "101", 2)); ASSERT_EQ(0, memcmp(buf, "101", 2));
// 0xFFFFFFFFFFFFFFFF
my_uitos(buf, 18446744073709551615LLU, 20);
ASSERT_EQ(0, memcmp(buf, "18446744073709551615", 20));
} }
TEST(LinuxLibcSupportTest, strchr) { TEST(LinuxLibcSupportTest, strchr) {