RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #4680 from authmillenon/od/fix/nano-specs

Browse Source 
od: fix for nano-specs
This commit is contained in:
Hauke Petersen 2016-01-26 18:09:17 +01:00
commit bc0a589886
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/od/od.c
View File

@ -78,7 +78,7 @@ static inline void _bytes_format(char *format, uint16_t flags)
switch (flags & (OD_FLAGS_BYTES_MASK | OD_FLAGS_LENGTH_MASK)) { switch (flags & (OD_FLAGS_BYTES_MASK | OD_FLAGS_LENGTH_MASK)) {
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_1: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_1:
strncpy(format, " %03" PRIo8, sizeof(" %03" PRIo8)); strncpy(format, " %03o", sizeof(" %03o"));
break; break;
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_2: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_2:
@ -95,24 +95,24 @@ static inline void _bytes_format(char *format, uint16_t flags)
#if !defined(__MACH__) #if !defined(__MACH__)
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%0%dho", sizeof(short) * _OCTAL_BYTE_LENGTH); sprintf(format, " %%0%do", sizeof(short) * _OCTAL_BYTE_LENGTH);
break; break;
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%0%dlo", sizeof(long) * _OCTAL_BYTE_LENGTH); sprintf(format, " %%0%dlo", sizeof(long) * _OCTAL_BYTE_LENGTH);
break; break;
#else /* !defined(__MACH__) */ #else /* !defined(__MACH__) */
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %lu", sizeof(short) * _OCTAL_BYTE_LENGTH); sprintf(format, " %lu", sizeof(short) * _OCTAL_BYTE_LENGTH);
break; break;
case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_OCTAL | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %lu", sizeof(long) * _OCTAL_BYTE_LENGTH); sprintf(format, " %lu", sizeof(long) * _OCTAL_BYTE_LENGTH);
break; break;
#endif /* !defined(__MACH__) */ #endif /* !defined(__MACH__) */
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_1: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_1:
strncpy(format, " %4" PRId8, sizeof(" %4" PRId8)); strncpy(format, " %4d", sizeof(" %4d"));
break; break;
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_2: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_2:
@ -129,13 +129,13 @@ static inline void _bytes_format(char *format, uint16_t flags)
#if !defined(__MACH__) #if !defined(__MACH__)
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%%dhd", sizeof(short) * _INT_BYTE_LENGTH); sprintf(format, " %%%dd", sizeof(short) * _INT_BYTE_LENGTH);
break; break;
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%%dld", sizeof(long) * _INT_BYTE_LENGTH); sprintf(format, " %%%dld", sizeof(long) * _INT_BYTE_LENGTH);
break; break;
#else /* !defined(__MACH__) */ #else /* !defined(__MACH__) */
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%%ld", sizeof(short) * _INT_BYTE_LENGTH); sprintf(format, " %%%ld", sizeof(short) * _INT_BYTE_LENGTH);
break; break;
@ -143,10 +143,10 @@ static inline void _bytes_format(char *format, uint16_t flags)
case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_INT | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%%ld", sizeof(long) * _INT_BYTE_LENGTH); sprintf(format, " %%%ld", sizeof(long) * _INT_BYTE_LENGTH);
break; break;
#endif /* !defined(__MACH__) */ #endif /* !defined(__MACH__) */
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_1: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_1:
strncpy(format, " %3" PRIu8, sizeof(" %3" PRIu8)); strncpy(format, " %3u", sizeof(" %3u"));
break; break;
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_2: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_2:
@ -163,13 +163,13 @@ static inline void _bytes_format(char *format, uint16_t flags)
#if !defined(__MACH__) #if !defined(__MACH__)
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%%dhu", sizeof(short) * _INT_BYTE_LENGTH); sprintf(format, " %%%uu", (unsigned)sizeof(short) * _INT_BYTE_LENGTH);
break; break;
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%%dlu", sizeof(long) * _INT_BYTE_LENGTH); sprintf(format, " %%%ulu", sizeof(long) * _INT_BYTE_LENGTH);
break; break;
#else /* !defined(__MACH__) */ #else /* !defined(__MACH__) */
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%%lu", sizeof(short) * _INT_BYTE_LENGTH); sprintf(format, " %%%lu", sizeof(short) * _INT_BYTE_LENGTH);
break; break;
@ -177,10 +177,10 @@ static inline void _bytes_format(char *format, uint16_t flags)
case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_UINT | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%%lu", sizeof(long) * _INT_BYTE_LENGTH); sprintf(format, " %%%lu", sizeof(long) * _INT_BYTE_LENGTH);
break; break;
#endif /* !defined(__MACH__) */ #endif /* !defined(__MACH__) */
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_1: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_1:
strncpy(format, " %02" PRIx8, sizeof(" %02" PRIx8)); strncpy(format, " %02x", sizeof(" %02x"));
break; break;
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_2: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_2:
@ -197,13 +197,13 @@ static inline void _bytes_format(char *format, uint16_t flags)
#if !defined(__MACH__) #if !defined(__MACH__)
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%0%dhx", sizeof(short) * _HEX_BYTE_LENGTH); sprintf(format, " %%0%ux", (unsigned)sizeof(short) * _HEX_BYTE_LENGTH);
break; break;
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%0%dlx", sizeof(long) * _HEX_BYTE_LENGTH); sprintf(format, " %%0%ulx", (unsigned)sizeof(long) * _HEX_BYTE_LENGTH);
break; break;
#else /* !defined(__MACH__) */ #else /* !defined(__MACH__) */
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_SHORT: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_SHORT:
sprintf(format, " %%0%lx", sizeof(short) * _HEX_BYTE_LENGTH); sprintf(format, " %%0%lx", sizeof(short) * _HEX_BYTE_LENGTH);
break; break;
@ -211,7 +211,7 @@ static inline void _bytes_format(char *format, uint16_t flags)
case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_LONG: case OD_FLAGS_BYTES_HEX | OD_FLAGS_LENGTH_LONG:
sprintf(format, " %%0%lx", sizeof(long) * _HEX_BYTE_LENGTH); sprintf(format, " %%0%lx", sizeof(long) * _HEX_BYTE_LENGTH);
break; break;
#endif /* !defined(__MACH__) */ #endif /* !defined(__MACH__) */
default: default:
break; break;