diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-05 06:51:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-05 06:51:06 +0000 |
commit | 7d60fc1c0a96983d0909f50f8db26ca1b770b039 (patch) | |
tree | 91c28e9c23da1ae55d5b2c82d16fe39b340f40dc | |
parent | bedfabd500b5dd684ac0b0780147a81bbb37f084 (diff) | |
download | busybox-w32-7d60fc1c0a96983d0909f50f8db26ca1b770b039.tar.gz busybox-w32-7d60fc1c0a96983d0909f50f8db26ca1b770b039.tar.bz2 busybox-w32-7d60fc1c0a96983d0909f50f8db26ca1b770b039.zip |
replace single-char printf's with bb_putchar
-rw-r--r-- | miscutils/hdparm.c | 34 | ||||
-rw-r--r-- | modutils/lsmod.c | 6 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 2 |
3 files changed, 22 insertions, 20 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 8c0e47334..aa95b89b0 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -1108,7 +1108,7 @@ static void identify(uint16_t *val) | |||
1108 | jj = val[ERASE_TIME] & ERASE_BITS; | 1108 | jj = val[ERASE_TIME] & ERASE_BITS; |
1109 | kk = val[ENH_ERASE_TIME] & ERASE_BITS; | 1109 | kk = val[ENH_ERASE_TIME] & ERASE_BITS; |
1110 | if (jj || kk) { | 1110 | if (jj || kk) { |
1111 | printf("\t"); | 1111 | bb_putchar('\t'); |
1112 | if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, ""); | 1112 | if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, ""); |
1113 | if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED "); | 1113 | if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED "); |
1114 | bb_putchar('\n'); | 1114 | bb_putchar('\n'); |
@@ -1235,46 +1235,46 @@ static void dump_identity(const struct hd_driveid *id) | |||
1235 | if (id->capability & 1) { | 1235 | if (id->capability & 1) { |
1236 | if (id->dma_1word | id->dma_mword) { | 1236 | if (id->dma_1word | id->dma_mword) { |
1237 | printf("\n DMA modes: "); | 1237 | printf("\n DMA modes: "); |
1238 | if (id->dma_1word & 0x100) printf("*"); | 1238 | if (id->dma_1word & 0x100) bb_putchar('*'); |
1239 | if (id->dma_1word & 1) printf("sdma0 "); | 1239 | if (id->dma_1word & 1) printf("sdma0 "); |
1240 | if (id->dma_1word & 0x200) printf("*"); | 1240 | if (id->dma_1word & 0x200) bb_putchar('*'); |
1241 | if (id->dma_1word & 2) printf("sdma1 "); | 1241 | if (id->dma_1word & 2) printf("sdma1 "); |
1242 | if (id->dma_1word & 0x400) printf("*"); | 1242 | if (id->dma_1word & 0x400) bb_putchar('*'); |
1243 | if (id->dma_1word & 4) printf("sdma2 "); | 1243 | if (id->dma_1word & 4) printf("sdma2 "); |
1244 | if (id->dma_1word & 0xf800) printf("*"); | 1244 | if (id->dma_1word & 0xf800) bb_putchar('*'); |
1245 | if (id->dma_1word & 0xf8) printf("sdma? "); | 1245 | if (id->dma_1word & 0xf8) printf("sdma? "); |
1246 | if (id->dma_mword & 0x100) printf("*"); | 1246 | if (id->dma_mword & 0x100) bb_putchar('*'); |
1247 | if (id->dma_mword & 1) printf("mdma0 "); | 1247 | if (id->dma_mword & 1) printf("mdma0 "); |
1248 | if (id->dma_mword & 0x200) printf("*"); | 1248 | if (id->dma_mword & 0x200) bb_putchar('*'); |
1249 | if (id->dma_mword & 2) printf("mdma1 "); | 1249 | if (id->dma_mword & 2) printf("mdma1 "); |
1250 | if (id->dma_mword & 0x400) printf("*"); | 1250 | if (id->dma_mword & 0x400) bb_putchar('*'); |
1251 | if (id->dma_mword & 4) printf("mdma2 "); | 1251 | if (id->dma_mword & 4) printf("mdma2 "); |
1252 | if (id->dma_mword & 0xf800) printf("*"); | 1252 | if (id->dma_mword & 0xf800) bb_putchar('*'); |
1253 | if (id->dma_mword & 0xf8) printf("mdma? "); | 1253 | if (id->dma_mword & 0xf8) printf("mdma? "); |
1254 | } | 1254 | } |
1255 | } | 1255 | } |
1256 | if (((id->capability & 8) || (id->field_valid & 2)) && id->field_valid & 4) { | 1256 | if (((id->capability & 8) || (id->field_valid & 2)) && id->field_valid & 4) { |
1257 | printf("\n UDMA modes: "); | 1257 | printf("\n UDMA modes: "); |
1258 | if (id->dma_ultra & 0x100) printf("*"); | 1258 | if (id->dma_ultra & 0x100) bb_putchar('*'); |
1259 | if (id->dma_ultra & 0x001) printf("udma0 "); | 1259 | if (id->dma_ultra & 0x001) printf("udma0 "); |
1260 | if (id->dma_ultra & 0x200) printf("*"); | 1260 | if (id->dma_ultra & 0x200) bb_putchar('*'); |
1261 | if (id->dma_ultra & 0x002) printf("udma1 "); | 1261 | if (id->dma_ultra & 0x002) printf("udma1 "); |
1262 | if (id->dma_ultra & 0x400) printf("*"); | 1262 | if (id->dma_ultra & 0x400) bb_putchar('*'); |
1263 | if (id->dma_ultra & 0x004) printf("udma2 "); | 1263 | if (id->dma_ultra & 0x004) printf("udma2 "); |
1264 | #ifdef __NEW_HD_DRIVE_ID | 1264 | #ifdef __NEW_HD_DRIVE_ID |
1265 | if (id->hw_config & 0x2000) { | 1265 | if (id->hw_config & 0x2000) { |
1266 | #else /* !__NEW_HD_DRIVE_ID */ | 1266 | #else /* !__NEW_HD_DRIVE_ID */ |
1267 | if (id->word93 & 0x2000) { | 1267 | if (id->word93 & 0x2000) { |
1268 | #endif /* __NEW_HD_DRIVE_ID */ | 1268 | #endif /* __NEW_HD_DRIVE_ID */ |
1269 | if (id->dma_ultra & 0x0800) printf("*"); | 1269 | if (id->dma_ultra & 0x0800) bb_putchar('*'); |
1270 | if (id->dma_ultra & 0x0008) printf("udma3 "); | 1270 | if (id->dma_ultra & 0x0008) printf("udma3 "); |
1271 | if (id->dma_ultra & 0x1000) printf("*"); | 1271 | if (id->dma_ultra & 0x1000) bb_putchar('*'); |
1272 | if (id->dma_ultra & 0x0010) printf("udma4 "); | 1272 | if (id->dma_ultra & 0x0010) printf("udma4 "); |
1273 | if (id->dma_ultra & 0x2000) printf("*"); | 1273 | if (id->dma_ultra & 0x2000) bb_putchar('*'); |
1274 | if (id->dma_ultra & 0x0020) printf("udma5 "); | 1274 | if (id->dma_ultra & 0x0020) printf("udma5 "); |
1275 | if (id->dma_ultra & 0x4000) printf("*"); | 1275 | if (id->dma_ultra & 0x4000) bb_putchar('*'); |
1276 | if (id->dma_ultra & 0x0040) printf("udma6 "); | 1276 | if (id->dma_ultra & 0x0040) printf("udma6 "); |
1277 | if (id->dma_ultra & 0x8000) printf("*"); | 1277 | if (id->dma_ultra & 0x8000) bb_putchar('*'); |
1278 | if (id->dma_ultra & 0x0080) printf("udma7 "); | 1278 | if (id->dma_ultra & 0x0080) printf("udma7 "); |
1279 | } | 1279 | } |
1280 | } | 1280 | } |
diff --git a/modutils/lsmod.c b/modutils/lsmod.c index da8663acb..a2330fe98 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c | |||
@@ -122,11 +122,13 @@ int lsmod_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) | |||
122 | if (!(info.flags & NEW_MOD_USED_ONCE)) | 122 | if (!(info.flags & NEW_MOD_USED_ONCE)) |
123 | printf(" (unused)"); | 123 | printf(" (unused)"); |
124 | } | 124 | } |
125 | if (count) printf(" ["); | 125 | if (count) |
126 | printf(" ["); | ||
126 | for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { | 127 | for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { |
127 | printf("%s%s", dn, (j==count-1)? "":" "); | 128 | printf("%s%s", dn, (j==count-1)? "":" "); |
128 | } | 129 | } |
129 | if (count) printf("]"); | 130 | if (count) |
131 | bb_putchar(']'); | ||
130 | 132 | ||
131 | bb_putchar('\n'); | 133 | bb_putchar('\n'); |
132 | } | 134 | } |
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 4bc87e7b8..3bf854e11 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c | |||
@@ -41,7 +41,7 @@ typedef struct filter_t { | |||
41 | 41 | ||
42 | static void print_link_flags(unsigned flags, unsigned mdown) | 42 | static void print_link_flags(unsigned flags, unsigned mdown) |
43 | { | 43 | { |
44 | printf("<"); | 44 | bb_putchar('<'); |
45 | flags &= ~IFF_RUNNING; | 45 | flags &= ~IFF_RUNNING; |
46 | #define _PF(f) if (flags & IFF_##f) { \ | 46 | #define _PF(f) if (flags & IFF_##f) { \ |
47 | flags &= ~IFF_##f; \ | 47 | flags &= ~IFF_##f; \ |