aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-29 12:02:57 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-29 12:02:57 +0000
commit1fd3b38fd19057e7b048e08d6157ece06874feb1 (patch)
treee0730c5ad066166e9d642be9a7247bcba0d75cc6
parent052ad9a56883a56742cec1afc6c1c8dfff222495 (diff)
downloadbusybox-w32-1fd3b38fd19057e7b048e08d6157ece06874feb1.tar.gz
busybox-w32-1fd3b38fd19057e7b048e08d6157ece06874feb1.tar.bz2
busybox-w32-1fd3b38fd19057e7b048e08d6157ece06874feb1.zip
*: bb_error_msg's messages should not be capitalized
-rw-r--r--miscutils/flash_eraseall.c2
-rw-r--r--networking/ifplugd.c4
-rw-r--r--networking/tc.c8
-rw-r--r--util-linux/mkfs_vfat.c10
4 files changed, 12 insertions, 12 deletions
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 3e0c06ffd..4f3e94dc1 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -97,7 +97,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
97 if (clmlen > 8) 97 if (clmlen > 8)
98 clmlen = 8; 98 clmlen = 8;
99 if (clmlen == 0) 99 if (clmlen == 0)
100 bb_error_msg_and_die("Autoplacement selected and no empty space in oob"); 100 bb_error_msg_and_die("autoplacement selected and no empty space in oob");
101 } else { 101 } else {
102 /* Legacy mode */ 102 /* Legacy mode */
103 switch (meminfo.oobsize) { 103 switch (meminfo.oobsize) {
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 3315e9a4d..c9f603f2c 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -258,7 +258,7 @@ static void up_iface(void)
258 if (network_ioctl(SIOCGIFADDR, &ifrequest) < 0) { 258 if (network_ioctl(SIOCGIFADDR, &ifrequest) < 0) {
259 bb_error_msg("can't get interface address"); 259 bb_error_msg("can't get interface address");
260 } else if (ifrequest.ifr_addr.sa_family != AF_INET) { 260 } else if (ifrequest.ifr_addr.sa_family != AF_INET) {
261 bb_perror_msg("The interface is not IP-based"); 261 bb_perror_msg("the interface is not IP-based");
262 } else { 262 } else {
263 ((struct sockaddr_in*)(&ifrequest.ifr_addr))->sin_addr.s_addr = INADDR_ANY; 263 ((struct sockaddr_in*)(&ifrequest.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
264 if (network_ioctl(SIOCSIFADDR, &ifrequest) < 0) 264 if (network_ioctl(SIOCSIFADDR, &ifrequest) < 0)
@@ -299,7 +299,7 @@ static void maybe_up_new_iface(void)
299 (uint8_t)(ifrequest.ifr_hwaddr.sa_data[5])); 299 (uint8_t)(ifrequest.ifr_hwaddr.sa_data[5]));
300 } 300 }
301 301
302 bb_error_msg("Using interface %s%s with driver<%s> (version: %s)", 302 bb_error_msg("using interface %s%s with driver<%s> (version: %s)",
303 G.iface, buf, driver_info.driver, driver_info.version); 303 G.iface, buf, driver_info.driver, driver_info.version);
304 } 304 }
305#endif 305#endif
diff --git a/networking/tc.c b/networking/tc.c
index 03f57f637..79cdd7c55 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -284,12 +284,12 @@ static int print_qdisc(const struct sockaddr_nl *who UNUSED_PARAM,
284 char *name; 284 char *name;
285 285
286 if (hdr->nlmsg_type != RTM_NEWQDISC && hdr->nlmsg_type != RTM_DELQDISC) { 286 if (hdr->nlmsg_type != RTM_NEWQDISC && hdr->nlmsg_type != RTM_DELQDISC) {
287 /* bb_error_msg("Not a qdisc"); */ 287 /* bb_error_msg("not a qdisc"); */
288 return 0; /* ??? mimic upstream; should perhaps return -1 */ 288 return 0; /* ??? mimic upstream; should perhaps return -1 */
289 } 289 }
290 len -= NLMSG_LENGTH(sizeof(*msg)); 290 len -= NLMSG_LENGTH(sizeof(*msg));
291 if (len < 0) { 291 if (len < 0) {
292 /* bb_error_msg("Wrong len %d", len); */ 292 /* bb_error_msg("wrong len %d", len); */
293 return -1; 293 return -1;
294 } 294 }
295 /* not the desired interface? */ 295 /* not the desired interface? */
@@ -342,12 +342,12 @@ static int print_class(const struct sockaddr_nl *who UNUSED_PARAM,
342 /*XXX Eventually factor out common code */ 342 /*XXX Eventually factor out common code */
343 343
344 if (hdr->nlmsg_type != RTM_NEWTCLASS && hdr->nlmsg_type != RTM_DELTCLASS) { 344 if (hdr->nlmsg_type != RTM_NEWTCLASS && hdr->nlmsg_type != RTM_DELTCLASS) {
345 /* bb_error_msg("Not a class"); */ 345 /* bb_error_msg("not a class"); */
346 return 0; /* ??? mimic upstream; should perhaps return -1 */ 346 return 0; /* ??? mimic upstream; should perhaps return -1 */
347 } 347 }
348 len -= NLMSG_LENGTH(sizeof(*msg)); 348 len -= NLMSG_LENGTH(sizeof(*msg));
349 if (len < 0) { 349 if (len < 0) {
350 /* bb_error_msg("Wrong len %d", len); */ 350 /* bb_error_msg("wrong len %d", len); */
351 return -1; 351 return -1;
352 } 352 }
353 /* not the desired interface? */ 353 /* not the desired interface? */
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 72c2058b5..98a089502 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -273,10 +273,10 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
273 device_num == 0x0d00 || // xd 273 device_num == 0x0d00 || // xd
274 device_num == 0x1600 ) // hdc, hdd 274 device_num == 0x1600 ) // hdc, hdd
275 ) 275 )
276 bb_error_msg_and_die("Will not try to make filesystem on full-disk device (use -I if wanted)"); 276 bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)");
277 // can't work on mounted filesystems 277 // can't work on mounted filesystems
278 if (find_mount_point(device_name, NULL)) 278 if (find_mount_point(device_name, NULL))
279 bb_error_msg_and_die("Can't format mounted filesystem"); 279 bb_error_msg_and_die("can't format mounted filesystem");
280#endif 280#endif
281 // get true sector size 281 // get true sector size
282 // (parameter must be int*, not long* or size_t*) 282 // (parameter must be int*, not long* or size_t*)
@@ -562,7 +562,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
562 start_data_sector = (reserved_sect + NUM_FATS * sect_per_fat) * (bytes_per_sect / SECTOR_SIZE); 562 start_data_sector = (reserved_sect + NUM_FATS * sect_per_fat) * (bytes_per_sect / SECTOR_SIZE);
563 start_data_block = (start_data_sector + SECTORS_PER_BLOCK - 1) / SECTORS_PER_BLOCK; 563 start_data_block = (start_data_sector + SECTORS_PER_BLOCK - 1) / SECTORS_PER_BLOCK;
564 564
565 bb_info_msg("Searching for bad blocks "); 565 bb_info_msg("searching for bad blocks ");
566 currently_testing = 0; 566 currently_testing = 0;
567 try = TEST_BUFFER_BLOCKS; 567 try = TEST_BUFFER_BLOCKS;
568 while (currently_testing < volume_size_blocks) { 568 while (currently_testing < volume_size_blocks) {
@@ -577,7 +577,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
577 if (got < 0) 577 if (got < 0)
578 got = 0; 578 got = 0;
579 if (got & (BLOCK_SIZE - 1)) 579 if (got & (BLOCK_SIZE - 1))
580 bb_error_msg("Unexpected values in do_check: probably bugs"); 580 bb_error_msg("unexpected values in do_check: probably bugs");
581 got /= BLOCK_SIZE; 581 got /= BLOCK_SIZE;
582 currently_testing += got; 582 currently_testing += got;
583 if (got == try) { 583 if (got == try) {
@@ -592,7 +592,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
592 for (i = 0; i < SECTORS_PER_BLOCK; i++) { 592 for (i = 0; i < SECTORS_PER_BLOCK; i++) {
593 int cluster = (currently_testing * SECTORS_PER_BLOCK + i - start_data_sector) / (int) (sect_per_clust) / (bytes_per_sect / SECTOR_SIZE); 593 int cluster = (currently_testing * SECTORS_PER_BLOCK + i - start_data_sector) / (int) (sect_per_clust) / (bytes_per_sect / SECTOR_SIZE);
594 if (cluster < 0) 594 if (cluster < 0)
595 bb_error_msg_and_die("Invalid cluster number in mark_sector: probably bug!"); 595 bb_error_msg_and_die("invalid cluster number in mark_sector: probably bug!");
596 MARK_CLUSTER(cluster, BAD_FAT32); 596 MARK_CLUSTER(cluster, BAD_FAT32);
597 } 597 }
598 badblocks++; 598 badblocks++;