From 6d655be5df5a559253a3769f294a6255535ad3fd Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 6 Sep 2006 19:02:46 +0000 Subject: [PATCH] removed a lot of trailing \n in bb_msg() calls. It is added automatically by function itself. --- archival/dpkg.c | 6 +++--- archival/libunarchive/decompress_unzip.c | 2 +- archival/libunarchive/get_header_cpio.c | 2 +- e2fsprogs/e2fsck.c | 22 +++++++++++----------- e2fsprogs/tune2fs.c | 6 +++--- editors/awk.c | 2 +- editors/sed.c | 2 +- libbb/xfuncs.c | 2 +- loginutils/passwd.c | 10 +++++----- loginutils/sulogin.c | 6 +++--- miscutils/makedevs.c | 2 +- miscutils/rx.c | 4 ++-- modutils/insmod.c | 2 +- util-linux/mount.c | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/archival/dpkg.c b/archival/dpkg.c index 98f4f9725..163d91f19 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -492,7 +492,7 @@ static void add_split_dependencies(common_node_t *parent_node, const char *whole else if (strncmp(version, ">=", offset_ch) == 0) { edge->operator = VER_MORE_EQUAL; } else { - bb_error_msg_and_die("Illegal operator\n"); + bb_error_msg_and_die("Illegal operator"); } } /* skip to start of version numbers */ @@ -1136,7 +1136,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1 */ if ( root_of_alternatives && package_edge->type != root_of_alternatives->type - 1) - bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1 \n", + bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1", package_edge->type, root_of_alternatives->type); if (package_hashtable[package_num] != NULL) @@ -1718,7 +1718,7 @@ int dpkg_main(int argc, char **argv) search_name_hashtable(argv[optind]), search_name_hashtable("ANY"), VER_ANY); if (package_hashtable[deb_file[deb_count]->package] == NULL) { - bb_error_msg_and_die("Package %s is uninstalled or unknown\n", argv[optind]); + bb_error_msg_and_die("Package %s is uninstalled or unknown", argv[optind]); } package_num = deb_file[deb_count]->package; status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]); diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 7362da8c2..c0203cc4a 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -770,7 +770,7 @@ static int inflate_block(int *e) } default: /* bad block type */ - bb_error_msg_and_die("bad block type %d\n", t); + bb_error_msg_and_die("bad block type %d", t); } } diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index d405d0e1b..bc766c6aa 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c @@ -31,7 +31,7 @@ char get_header_cpio(archive_handle_t *archive_handle) oldtmp = NULL; while (tmp) { - bb_error_msg_and_die("need to fix this\n"); + bb_error_msg_and_die("need to fix this"); if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */ file_header = tmp->entry; if (oldtmp) { diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index 0282d328f..4c0614add 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c @@ -1469,7 +1469,7 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[]) bh->b_blocknr, 1, bh->b_data); if (retval) { - bb_error_msg("while reading block %lu\n", + bb_error_msg("while reading block %lu", (unsigned long) bh->b_blocknr); bh->b_err = retval; continue; @@ -1480,7 +1480,7 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[]) bh->b_blocknr, 1, bh->b_data); if (retval) { - bb_error_msg("while writing block %lu\n", + bb_error_msg("while writing block %lu", (unsigned long) bh->b_blocknr); bh->b_err = retval; continue; @@ -1796,7 +1796,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) ll_rw_block(READ, 1, &jbh); if (jbh->b_err) { - bb_error_msg(_("reading journal superblock\n")); + bb_error_msg(_("reading journal superblock")); return jbh->b_err; } @@ -1852,7 +1852,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) * format to be able to proceed safely, so any other checks that * fail we should attempt to recover from. */ if (jsb->s_blocksize != htonl(journal->j_blocksize)) { - bb_error_msg(_("%s: no valid journal superblock found\n"), + bb_error_msg(_("%s: no valid journal superblock found"), ctx->device_name); return EXT2_ET_CORRUPT_SUPERBLOCK; } @@ -1860,7 +1860,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) if (ntohl(jsb->s_maxlen) < journal->j_maxlen) journal->j_maxlen = ntohl(jsb->s_maxlen); else if (ntohl(jsb->s_maxlen) > journal->j_maxlen) { - bb_error_msg(_("%s: journal too short\n"), + bb_error_msg(_("%s: journal too short"), ctx->device_name); return EXT2_ET_CORRUPT_SUPERBLOCK; } @@ -5108,7 +5108,7 @@ static int delete_file_block(ext2_filsys fs, p = (struct dup_block *) dnode_get(n); decrement_badcount(ctx, *block_nr, p); } else - bb_error_msg(_("internal error; can't find dup_blk for %d\n"), + bb_error_msg(_("internal error; can't find dup_blk for %d"), *block_nr); } else { ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); @@ -5241,7 +5241,7 @@ static int clone_file_block(ext2_filsys fs, ext2fs_mark_block_bitmap(fs->block_map, new_block); return BLOCK_CHANGED; } else - bb_error_msg(_("internal error; can't find dup_blk for %d\n"), + bb_error_msg(_("internal error; can't find dup_blk for %d"), *block_nr); } return 0; @@ -12657,7 +12657,7 @@ static void check_mount(e2fsck_t ctx) printf(_("%s is mounted. "), ctx->filesystem_name); if (!ctx->interactive) - bb_error_msg_and_die(_("Cannot continue, aborting.\n\n")); + bb_error_msg_and_die(_("Cannot continue, aborting.")); printf(_("\n\n\007\007\007\007WARNING!!! " "Running e2fsck on a mounted filesystem may cause\n" "SEVERE filesystem damage.\007\007\007\n\n")); @@ -13377,7 +13377,7 @@ restart: * happen, unless the hardware or * device driver is being bogus. */ - bb_error_msg(_("unable to set superblock flags on %s\n"), ctx->device_name); + bb_error_msg(_("unable to set superblock flags on %s"), ctx->device_name); bb_error_msg_and_die(0); } retval = e2fsck_run_ext3_journal(ctx); @@ -13409,12 +13409,12 @@ restart: #ifdef ENABLE_COMPRESSION /* FIXME - do we support this at all? */ if (sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) - bb_error_msg(_("Warning: compression support is experimental.\n")); + bb_error_msg(_("Warning: compression support is experimental.")); #endif #ifndef ENABLE_HTREE if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) { bb_error_msg(_("E2fsck not compiled with HTREE support,\n\t" - "but filesystem %s has HTREE directories.\n"), + "but filesystem %s has HTREE directories."), ctx->device_name); goto get_newer; } diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c index 8ec346108..fba8b6c1f 100644 --- a/e2fsprogs/tune2fs.c +++ b/e2fsprogs/tune2fs.c @@ -663,7 +663,7 @@ int tune2fs_main(int argc, char **argv) if (s_flag == 1) { if (sb->s_feature_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) - bb_error_msg("\nThe filesystem already has sparse superblocks\n"); + bb_error_msg("\nThe filesystem already has sparse superblocks"); else { sb->s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER; @@ -675,7 +675,7 @@ int tune2fs_main(int argc, char **argv) if (s_flag == 0) { if (!(sb->s_feature_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) - bb_error_msg("\nThe filesystem already has sparse superblocks disabled\n"); + bb_error_msg("\nThe filesystem already has sparse superblocks disabled"); else { sb->s_feature_ro_compat &= ~EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER; @@ -698,7 +698,7 @@ int tune2fs_main(int argc, char **argv) } if (L_flag) { if (strlen(new_label) > sizeof(sb->s_volume_name)) - bb_error_msg("Warning: label too long, truncating\n"); + bb_error_msg("Warning: label too long, truncating"); memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name)); safe_strncpy(sb->s_volume_name, new_label, sizeof(sb->s_volume_name)); diff --git a/editors/awk.c b/editors/awk.c index 049673df3..6e81aa8f4 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -2691,7 +2691,7 @@ keep_going: free(s); break; case 'W': - bb_error_msg("Warning: unrecognized option '-W %s' ignored\n", optarg); + bb_error_msg("Warning: unrecognized option '-W %s' ignored", optarg); break; default: diff --git a/editors/sed.c b/editors/sed.c index d5cf3f219..40eef80bc 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -512,7 +512,7 @@ static void add_cmd(char *cmdstr) cmdstr++; idx = get_address(cmdstr, &sed_cmd->end_line, &sed_cmd->end_match); - if (!idx) bb_error_msg_and_die("no address after comma\n"); + if (!idx) bb_error_msg_and_die("no address after comma"); cmdstr += idx; } diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 4e407e45f..435379de2 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -109,7 +109,7 @@ FILE *xfopen(const char *path, const char *mode) int xopen(const char *pathname, int flags) { if (ENABLE_DEBUG && (flags & O_CREAT)) - bb_error_msg_and_die("xopen() with O_CREAT\n"); + bb_error_msg_and_die("xopen() with O_CREAT"); return xopen3(pathname, flags, 0777); } diff --git a/loginutils/passwd.c b/loginutils/passwd.c index aa75dd260..b0770e65c 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -170,11 +170,11 @@ int passwd_main(int argc, char **argv) } pw = getpwnam(name); if (!pw) { - bb_error_msg_and_die("Unknown user %s\n", name); + bb_error_msg_and_die("Unknown user %s", name); } if (!amroot && pw->pw_uid != getuid()) { syslog(LOG_WARNING, "can't change pwd for `%s'", name); - bb_error_msg_and_die("Permission denied.\n"); + bb_error_msg_and_die("Permission denied."); } if (ENABLE_FEATURE_SHADOWPASSWDS) { struct spwd *sp = getspnam(name); @@ -188,12 +188,12 @@ int passwd_main(int argc, char **argv) if (!amroot) { if (cp[0] == '!') { syslog(LOG_WARNING, "password locked for `%s'", np); - bb_error_msg_and_die( "The password for `%s' cannot be changed.\n", np); + bb_error_msg_and_die( "The password for `%s' cannot be changed.", np); } } printf("Changing password for %s\n", name); if (new_password(pw, amroot, algo)) { - bb_error_msg_and_die( "The password for %s is unchanged.\n", name); + bb_error_msg_and_die( "The password for %s is unchanged.", name); } } else if (lflg) { if (crypt_passwd[0] != '!') { @@ -222,7 +222,7 @@ int passwd_main(int argc, char **argv) printf("Password changed.\n"); } else { syslog(LOG_WARNING, "an error occurred updating the password file"); - bb_error_msg_and_die("An error occurred updating the password file.\n"); + bb_error_msg_and_die("An error occurred updating the password file."); } if (ENABLE_FEATURE_CLEAN_UP) free(myname); return (0); diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index b7e3f6fbf..1c49d324d 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -99,7 +99,7 @@ int sulogin_main(int argc, char **argv) } if (access(bb_path_passwd_file, 0) == -1) { syslog(LOG_WARNING, "No password file\n"); - bb_error_msg_and_die("No password file\n"); + bb_error_msg_and_die("No password file"); } if (!isatty(0) || !isatty(1) || !isatty(2)) { exit(EXIT_FAILURE); @@ -113,8 +113,8 @@ int sulogin_main(int argc, char **argv) signal(SIGALRM, catchalarm); if (!(pwd = getpwnam(name))) { - syslog(LOG_WARNING, "No password entry for `root'\n"); - bb_error_msg_and_die("No password entry for `root'\n"); + syslog(LOG_WARNING, "No password entry for `root'"); + bb_error_msg_and_die("No password entry for `root'"); } pwent = *pwd; #if ENABLE_FEATURE_SHADOWPASSWDS diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 70dfc4205..66b4ce00d 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -119,7 +119,7 @@ int makedevs_main(int argc, char **argv) { if (*line=='\0' || *line=='#' || isspace(*line)) continue; - bb_error_msg("line %d invalid: '%s'\n", linenum, line); + bb_error_msg("line %d invalid: '%s'", linenum, line); ret = EXIT_FAILURE; continue; } diff --git a/miscutils/rx.c b/miscutils/rx.c index 4cc4913e6..91606ecd0 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c @@ -266,7 +266,7 @@ int rx_main(int argc, char **argv) filefd = xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666); if (tcgetattr(ttyfd, &tty) < 0) - bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]); + bb_perror_msg_and_die("%s: tcgetattr failed", argv[0]); orig_tty = tty; @@ -284,7 +284,7 @@ int rx_main(int argc, char **argv) tcsetattr(ttyfd, TCSAFLUSH, &orig_tty); if (n < 0) - bb_error_msg_and_die("\n%s: receive failed:\n %s\n", + bb_error_msg_and_die("\n%s: receive failed:\n %s", argv[0], error_buf); bb_fflush_stdout_and_exit(EXIT_SUCCESS); diff --git a/modutils/insmod.c b/modutils/insmod.c index 3aabadd26..e57dd06dd 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -3562,7 +3562,7 @@ static int obj_load_progbits(FILE * fp, struct obj_file* f, char* imagebase) sec->contents = imagebase + (sec->header.sh_addr - base); fseek(fp, sec->header.sh_offset, SEEK_SET); if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { - bb_error_msg("error reading ELF section data: %s\n", strerror(errno)); + bb_perror_msg("error reading ELF section data"); return 0; } diff --git a/util-linux/mount.c b/util-linux/mount.c index 3b95428a0..e76c7db99 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -228,7 +228,7 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts) int i; if(!mountTable) - bb_error_msg("No %s\n",bb_path_mtab_file); + bb_error_msg("No %s",bb_path_mtab_file); // Add vfs string flags -- 2.25.1