diff options
Diffstat (limited to 'src/lib.c')
| -rw-r--r-- | src/lib.c | 38 |
1 files changed, 21 insertions, 17 deletions
@@ -45,19 +45,21 @@ int strncmp(const char *restrict lhs, const char *restrict rhs, unsigned long n) } char *strcpy(char *restrict dest, const char *restrict src) { - for(; (*dest = *src); dest++, src++); + char *d = dest; + for (; (*d = *src); d++, src++); return dest; } char *strncpy(char *restrict dest, const char *restrict src, unsigned long n) { - for(; (*dest = *src) && n; dest++, src++, n--); - memset(dest, 0, n); + char *d = dest; + for (; (*d = *src) && n; d++, src++, n--); + memset(d, 0, n); return dest; } size_t strlen(const char *str) { const char *p; - for(p = str; *p != 0; p++) {} + for (p = str; *p != 0; p++) {} return p - str; } @@ -86,8 +88,8 @@ int isdigit(int c) { #define ATOX(name, type) \ - type name(const char* s) { \ - for(; isspace(*s); s++); \ + type name(const char *s) { \ + for (; isspace(*s); s++); \ int neg = 0; \ switch (*s) { \ case '-': \ @@ -111,7 +113,7 @@ ATOX(atol, long int) ATOX(atoll, long long int) char itoc(int i) { - if(i < 10) { + if (i < 10) { return '0' + i; } else { return 'a' + (i - 10); @@ -119,9 +121,9 @@ char itoc(int i) { } int ctoi(char c) { - if(c < 'A') { + if (c < 'A') { return c - '0'; - } else if(c < 'a') { + } else if (c < 'a') { return c - 'A' + 10; } else { return c - 'a' + 10; @@ -216,13 +218,14 @@ end: for (; n; n /= radix) { \ *buffer++ = itoc(n % radix); \ } \ + char *buf_end = buffer; \ *buffer-- = '\0'; \ - while(buffer > start) { \ + while (buffer > start) { \ char tmp = *start; \ *start++ = *buffer; \ *buffer-- = tmp; \ } \ - return buffer; \ + return buf_end; \ } UXTOA(int, utoa) @@ -230,7 +233,7 @@ UXTOA(long int, ultoa) UXTOA(long long int, ulltoa) #define XTOA(type, name) \ - char *name(type n, char* buffer, int radix) { \ + char *name(type n, char *buffer, int radix) { \ if (n == 0) { \ buffer[0] = '0'; \ buffer[1] = '\0'; \ @@ -244,13 +247,14 @@ UXTOA(long long int, ulltoa) for (; n; n /= radix) { \ *buffer++ = itoc(n % radix); \ } \ + char *buf_end = buffer; \ *buffer-- = '\0'; \ - while(buffer > start) { \ + while (buffer > start) { \ char tmp = *start; \ *start++ = *buffer; \ *buffer-- = tmp; \ } \ - return buffer; \ + return buf_end; \ } XTOA(int, itoa) @@ -260,7 +264,7 @@ XTOA(long long int, lltoa) #define STRTOX(name, type) \ type name(const char *s, char **endptr, int radix) { \ *endptr = NULL; \ - for(; isspace(*s); s++); \ + for (; isspace(*s); s++); \ int neg = 0; \ switch (*s) { \ case '-': \ @@ -283,9 +287,9 @@ XTOA(long long int, lltoa) radix = 10; \ } \ } \ - for (; *s == '0'; s++, *endptr = (void*) s); \ + for (; *s == '0'; s++, *endptr = (void *) s); \ type num = 0; \ - for (; isdigit(*s); s++, *endptr = (void*) s) { \ + for (; isdigit(*s); s++, *endptr = (void *) s) { \ num *= radix; \ num += *s - '0'; \ } \ |