From c6f188def8c5496dbd65c9be6ca3050286db7227 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 26 Oct 2006 00:37:00 +0000 Subject: silly size savings and capitalization fixes --- coreutils/ls.c | 2 +- coreutils/sum.c | 2 +- e2fsprogs/blkid/dev.c | 2 +- e2fsprogs/blkid/read.c | 2 +- e2fsprogs/fsck.c | 2 +- e2fsprogs/lsattr.c | 4 ++-- e2fsprogs/uuid/uuid_time.c | 2 +- miscutils/hdparm.c | 26 +++++++++++++------------- modutils/lsmod.c | 4 ++-- networking/ether-wake.c | 2 +- networking/interface.c | 10 +++++----- networking/libiproute/ipaddress.c | 16 ++++++++-------- networking/libiproute/iproute.c | 30 +++++++++++++++--------------- networking/libiproute/iptunnel.c | 22 +++++++++++----------- networking/nslookup.c | 4 ++-- networking/ping.c | 2 +- networking/ping6.c | 2 +- procps/fuser.c | 2 +- shell/lash.c | 2 +- shell/msh.c | 4 ++-- util-linux/fdisk.c | 10 +++++----- util-linux/fdisk_osf.c | 4 ++-- util-linux/fsck_minix.c | 4 ++-- util-linux/getopt.c | 2 +- 24 files changed, 81 insertions(+), 81 deletions(-) diff --git a/coreutils/ls.c b/coreutils/ls.c index f34e83e..40e9228 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -485,7 +485,7 @@ static void showdirs(struct dnode **dn, int ndirs, int first) for (i = 0; i < ndirs; i++) { if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) { if (!first) - printf("\n"); + puts(""); first = 0; printf("%s:\n", dn[i]->fullname); } diff --git a/coreutils/sum.c b/coreutils/sum.c index 61ca582..d663e34 100644 --- a/coreutils/sum.c +++ b/coreutils/sum.c @@ -65,7 +65,7 @@ static int bsd_sum_file(const char *file, int print_name) if (print_name > 1) puts(file); else - printf("\n"); + puts(""); out: return ret; } diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c index c2b756c..b34d4a9 100644 --- a/e2fsprogs/blkid/dev.c +++ b/e2fsprogs/blkid/dev.c @@ -82,7 +82,7 @@ void blkid_debug_dump_dev(blkid_dev dev) else printf(" tag: NULL\n"); } - printf("\n"); + puts(""); } #endif diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index 624c907..bb02a2e 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c @@ -437,7 +437,7 @@ static void debug_dump_dev(blkid_dev dev) else printf(" tag: NULL\n"); } - printf("\n"); + puts(""); } int main(int argc, char**argv) diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index 06ba4b2..53657fb 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c @@ -614,7 +614,7 @@ static int execute(const char *type, const char *device, const char *mntpt, mntpt ? mntpt : device); for (i=0; i < argc; i++) printf("%s ", argv[i]); - printf("\n"); + puts(""); } /* Fork and execute the correct program. */ diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c index 13d5acf..eb28fcb 100644 --- a/e2fsprogs/lsattr.c +++ b/e2fsprogs/lsattr.c @@ -57,7 +57,7 @@ static void list_attributes(const char *name) if (flags & OPT_PF_LONG) { printf("%-28s ", name); print_flags(stdout, fsflags, PFOPT_LONG); - printf("\n"); + puts(""); } else { print_flags(stdout, fsflags, 0); printf(" %s\n", name); @@ -102,7 +102,7 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de, (de->d_name[1] != '.' && de->d_name[2] != '\0')))) { printf("\n%s:\n", path); iterate_on_dir(path, lsattr_dir_proc, NULL); - printf("\n"); + puts(""); } } } diff --git a/e2fsprogs/uuid/uuid_time.c b/e2fsprogs/uuid/uuid_time.c index df91ec3..b54d673 100644 --- a/e2fsprogs/uuid/uuid_time.c +++ b/e2fsprogs/uuid/uuid_time.c @@ -147,7 +147,7 @@ main(int argc, char **argv) printf(" (random)\n"); break; default: - printf("\n"); + puts(""); } if (type != 1) { printf("Warning: not a time-based UUID, so UUID time " diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index a30f4e0..90c1639 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -547,7 +547,7 @@ static void print_ascii(uint16_t *p, uint8_t length) { printf("%c%c",(char)0x00ff&((*p)>>8),(char)(*p)&0x00ff); p++; } - printf("\n"); + puts(""); } // Parse 512 byte disk identification block and print much crap. @@ -574,7 +574,7 @@ static void identify(uint16_t *id_supplied) chksum &= 0xff; /* check if we recognise the device type */ - printf("\n"); + puts(""); if (!(val[GEN_CONFIG] & NOT_ATA)) { dev = ATA_DEV; @@ -706,7 +706,7 @@ static void identify(uint16_t *id_supplied) else if (like_std > std) printf("& some of %u\n",like_std); else - printf("\n"); + puts(""); } else { @@ -818,7 +818,7 @@ static void identify(uint16_t *id_supplied) if (bbbig > 1000) printf("(%"PRIu64" GB)\n", bbbig/1000); else - printf("\n"); + puts(""); } /* hw support of commands (capabilities) */ @@ -870,7 +870,7 @@ static void identify(uint16_t *id_supplied) if ((like_std > 3) && ((val[CAPAB_1] & VALID) == VALID_VAL)) printf(", %s device specific minimum\n",(val[CAPAB_1] & MIN_STANDBY_TIMER)?"with":"no"); else - printf("\n"); + puts(""); } printf("\tR/W multiple sector transfer: "); if ((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER)) @@ -913,7 +913,7 @@ static void identify(uint16_t *id_supplied) printf("\tOverlap support:"); if (val[PKT_REL]) printf(" %uus to release bus.",val[PKT_REL]); if (val[SVC_NBSY]) printf(" %uus to clear BSY after SERVICE cmd.",val[SVC_NBSY]); - printf("\n"); + puts(""); } } @@ -944,7 +944,7 @@ static void identify(uint16_t *id_supplied) err_dma += mode_loop(jj,kk,'u',&have_mode); } if (err_dma || !have_mode) printf("(?)"); - printf("\n"); + puts(""); if ((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)) printf("\t\tInterleaved DMA support\n"); @@ -955,7 +955,7 @@ static void identify(uint16_t *id_supplied) printf("\t\tCycle time:"); if (val[DMA_TIME_MIN]) printf(" min=%uns",val[DMA_TIME_MIN]); if (val[DMA_TIME_NORM]) printf(" recommended=%uns",val[DMA_TIME_NORM]); - printf("\n"); + puts(""); } } @@ -971,13 +971,13 @@ static void identify(uint16_t *id_supplied) if (jj & 0x0001) printf("pio%d ",ii); jj >>=1; } - printf("\n"); + puts(""); } else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) ) { for (ii = 0; ii <= val[PIO_MODE]>>8; ii++) printf("pio%d ",ii); - printf("\n"); + puts(""); } else printf("unknown\n"); @@ -989,7 +989,7 @@ static void identify(uint16_t *id_supplied) printf("\t\tCycle time:"); if (val[PIO_NO_FLOW]) printf(" no flow control=%uns", val[PIO_NO_FLOW]); if (val[PIO_FLOW]) printf(" IORDY flow control=%uns", val[PIO_FLOW]); - printf("\n"); + puts(""); } } @@ -1049,7 +1049,7 @@ static void identify(uint16_t *id_supplied) printf("\t"); if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, ""); if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED "); - printf("\n"); + puts(""); } } @@ -1194,7 +1194,7 @@ static void dump_identity(const struct hd_driveid *id) else printf("off"); } - printf("\n"); + puts(""); if (!(id->field_valid&1)) printf(" (maybe):"); diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 2bf4afb..f462aaf 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -15,7 +15,7 @@ #ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE -static void check_tainted(void) { printf("\n"); } +static void check_tainted(void) { puts(""); } #else #define TAINT_FILENAME "/proc/sys/kernel/tainted" #define TAINT_PROPRIETORY_MODULE (1<<0) @@ -127,7 +127,7 @@ int lsmod_main(int argc, char **argv) } if (count) printf("]"); - printf("\n"); + puts(""); } #ifdef CONFIG_FEATURE_CLEAN_UP diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 9d616d5..aaed4a0 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c @@ -92,7 +92,7 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize) printf("packet dump:\n"); for (i = 0; i < pktsize; ++i) { printf("%2.2x ", outpack[i]); - if (i % 20 == 19) printf("\n"); + if (i % 20 == 19) puts(""); } printf("\n\n"); } diff --git a/networking/interface.c b/networking/interface.c index 4594293..6c8e938 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -938,7 +938,7 @@ static void ife_print(struct interface *ptr) printf("(auto)"); } #endif - printf("\n"); + puts(""); if (ptr->has_ip) { printf(" %s addr:%s ", ap->name, @@ -1007,7 +1007,7 @@ static void ife_print(struct interface *ptr) default: printf("Unknown"); } - printf("\n"); + puts(""); } } fclose(f); @@ -1034,7 +1034,7 @@ static void ife_print(struct interface *ptr) if (ptr->outfill || ptr->keepalive) printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive); #endif - printf("\n"); + puts(""); /* If needed, display the interface statistics. */ @@ -1083,9 +1083,9 @@ static void ife_print(struct interface *ptr) } if (ptr->map.dma) printf("DMA chan:%x ", ptr->map.dma); - printf("\n"); + puts(""); } - printf("\n"); + puts(""); } diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 262d3e3..35fd099 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -435,7 +435,7 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush) return -1; } if (filter.family == AF_PACKET) { - bb_error_msg("Cannot flush link addresses."); + bb_error_msg("cannot flush link addresses"); return -1; } } @@ -488,17 +488,17 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush) exit(1); if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETLINK) < 0) { - bb_perror_msg_and_die("Cannot send dump request"); + bb_perror_msg_and_die("cannot send dump request"); } if (rtnl_dump_filter(&rth, store_nlmsg, &linfo, NULL, NULL) < 0) { - bb_error_msg_and_die("Dump terminated"); + bb_error_msg_and_die("dump terminated"); } if (filter_dev) { filter.ifindex = ll_name_to_index(filter_dev); if (filter.ifindex <= 0) { - bb_error_msg("Device \"%s\" does not exist", filter_dev); + bb_error_msg("device \"%s\" does not exist", filter_dev); return -1; } } @@ -532,11 +532,11 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush) if (filter.family != AF_PACKET) { if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) { - bb_perror_msg_and_die("Cannot send dump request"); + bb_perror_msg_and_die("cannot send dump request"); } if (rtnl_dump_filter(&rth, store_nlmsg, &ainfo, NULL, NULL) < 0) { - bb_error_msg_and_die("Dump terminated"); + bb_error_msg_and_die("dump terminated"); } } @@ -763,7 +763,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) inet_prefix brd; int i; if (req.ifa.ifa_family != AF_INET) { - bb_error_msg("Broadcast can be set only for IPv4 addresses"); + bb_error_msg("broadcast can be set only for IPv4 addresses"); return -1; } brd = peer; @@ -787,7 +787,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) ll_init_map(&rth); if ((req.ifa.ifa_index = ll_name_to_index(d)) == 0) { - bb_error_msg("Cannot find device \"%s\"", d); + bb_error_msg("cannot find device \"%s\"", d); return -1; } diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 6c902eb..077c919 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -398,7 +398,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv) if (d) { if ((idx = ll_name_to_index(d)) == 0) { - bb_error_msg("Cannot find device \"%s\"", d); + bb_error_msg("cannot find device \"%s\"", d); return -1; } addattr32(&req.n, sizeof(req), RTA_OIF, idx); @@ -571,7 +571,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) if (id) { if ((idx = ll_name_to_index(id)) == 0) { - bb_error_msg("Cannot find device \"%s\"", id); + bb_error_msg("cannot find device \"%s\"", id); return -1; } filter.iif = idx; @@ -579,7 +579,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) } if (od) { if ((idx = ll_name_to_index(od)) == 0) { - bb_error_msg("Cannot find device \"%s\"", od); + bb_error_msg("cannot find device \"%s\"", od); } filter.oif = idx; filter.oifmask = -1; @@ -608,7 +608,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) } filter.flushed = 0; if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { - bb_error_msg("Flush terminated"); + bb_error_msg("flush terminated"); return -1; } if (filter.flushed == 0) { @@ -622,16 +622,16 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) if (filter.tb != -1) { if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { - bb_perror_msg_and_die("Cannot send dump request"); + bb_perror_msg_and_die("cannot send dump request"); } } else { if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { - bb_perror_msg_and_die("Cannot send dump request"); + bb_perror_msg_and_die("cannot send dump request"); } } if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { - bb_error_msg_and_die("Dump terminated"); + bb_error_msg_and_die("dump terminated"); } exit(0); @@ -733,14 +733,14 @@ static int iproute_get(int argc, char **argv) if (idev) { if ((idx = ll_name_to_index(idev)) == 0) { - bb_error_msg("Cannot find device \"%s\"", idev); + bb_error_msg("cannot find device \"%s\"", idev); return -1; } addattr32(&req.n, sizeof(req), RTA_IIF, idx); } if (odev) { if ((idx = ll_name_to_index(odev)) == 0) { - bb_error_msg("Cannot find device \"%s\"", odev); + bb_error_msg("cannot find device \"%s\"", odev); return -1; } addattr32(&req.n, sizeof(req), RTA_OIF, idx); @@ -761,16 +761,16 @@ static int iproute_get(int argc, char **argv) struct rtattr * tb[RTA_MAX+1]; if (print_route(NULL, &req.n, (void*)stdout) < 0) { - bb_error_msg_and_die("An error :-)"); + bb_error_msg_and_die("an error :-)"); } if (req.n.nlmsg_type != RTM_NEWROUTE) { - bb_error_msg("Not a route?"); + bb_error_msg("not a route?"); return -1; } len -= NLMSG_LENGTH(sizeof(*r)); if (len < 0) { - bb_error_msg("Wrong len %d", len); + bb_error_msg("wrong len %d", len); return -1; } @@ -781,7 +781,7 @@ static int iproute_get(int argc, char **argv) tb[RTA_PREFSRC]->rta_type = RTA_SRC; r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]); } else if (!tb[RTA_SRC]) { - bb_error_msg("Failed to connect the route"); + bb_error_msg("failed to connect the route"); return -1; } if (!odev && tb[RTA_OIF]) { @@ -802,7 +802,7 @@ static int iproute_get(int argc, char **argv) } if (print_route(NULL, &req.n, (void*)stdout) < 0) { - bb_error_msg_and_die("An error :-)"); + bb_error_msg_and_die("an error :-)"); } exit(0); @@ -849,7 +849,7 @@ int do_iproute(int argc, char **argv) case 12: /* flush */ return iproute_list_or_flush(argc-1, argv+1, 1); default: - bb_error_msg_and_die("Unknown command %s", *argv); + bb_error_msg_and_die("unknown command %s", *argv); } return iproute_modify(cmd, flags, argc-1, argv+1); diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 806d865..2b9d305 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -164,26 +164,26 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p) if (strcmp(*argv, "ipip") == 0 || strcmp(*argv, "ip/ip") == 0) { if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) { - bb_error_msg("You managed to ask for more than one tunnel mode."); + bb_error_msg("you managed to ask for more than one tunnel mode"); exit(-1); } p->iph.protocol = IPPROTO_IPIP; } else if (strcmp(*argv, "gre") == 0 || strcmp(*argv, "gre/ip") == 0) { if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) { - bb_error_msg("You managed to ask for more than one tunnel mode."); + bb_error_msg("you managed to ask for more than one tunnel mode"); exit(-1); } p->iph.protocol = IPPROTO_GRE; } else if (strcmp(*argv, "sit") == 0 || strcmp(*argv, "ipv6/ip") == 0) { if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) { - bb_error_msg("You managed to ask for more than one tunnel mode."); + bb_error_msg("you managed to ask for more than one tunnel mode"); exit(-1); } p->iph.protocol = IPPROTO_IPV6; } else { - bb_error_msg("Cannot guess tunnel mode."); + bb_error_msg("cannot guess tunnel mode"); exit(-1); } } else if (strcmp(*argv, "key") == 0) { @@ -306,7 +306,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p) if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) { if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) { - bb_error_msg("Keys are not allowed with ipip and sit."); + bb_error_msg("keys are not allowed with ipip and sit"); return -1; } } @@ -326,7 +326,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p) p->o_flags |= GRE_KEY; } if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) { - bb_error_msg("Broadcast tunnel requires a source address."); + bb_error_msg("broadcast tunnel requires a source address"); return -1; } return 0; @@ -462,7 +462,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) buf[sizeof(buf) - 1] = 0; if ((ptr = strchr(buf, ':')) == NULL || (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) { - bb_error_msg("Wrong format of /proc/net/dev. Sorry."); + bb_error_msg("wrong format of /proc/net/dev. Sorry"); return -1; } if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", @@ -475,7 +475,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) continue; type = do_ioctl_get_iftype(name); if (type == -1) { - bb_error_msg("Failed to get type of [%s]", name); + bb_error_msg("failed to get type of [%s]", name); continue; } if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT) @@ -490,7 +490,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) (p->i_key && p1.i_key != p->i_key)) continue; print_tunnel(&p1); - printf("\n"); + puts(""); } return 0; } @@ -521,7 +521,7 @@ static int do_show(int argc, char **argv) return -1; print_tunnel(&p); - printf("\n"); + puts(""); return 0; } @@ -541,6 +541,6 @@ int do_iptunnel(int argc, char **argv) } else return do_show(0, NULL); - bb_error_msg("Command \"%s\" is unknown.", *argv); + bb_error_msg("command \"%s\" is unknown", *argv); exit(-1); } diff --git a/networking/nslookup.c b/networking/nslookup.c index b8e454c..54e71c4 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c @@ -73,7 +73,7 @@ static int addr_list_fprint(char **h_addr_list) } } - printf("\n"); + puts(""); return 0; } @@ -123,7 +123,7 @@ static inline void server_print(void) char *ip = inet_ntoa(def.sin_addr); hostent_fprint(gethostbyaddr_wrapper(ip), "Server:"); - printf("\n"); + puts(""); } /* alter the global _res nameserver structure to use diff --git a/networking/ping.c b/networking/ping.c index ebde007..782b801 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -314,7 +314,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from) printf(" time=%lu.%lu ms", triptime / 10, triptime % 10); if (dupflag) printf(" (DUP!)"); - printf("\n"); + puts(""); } else if (icmppkt->icmp_type != ICMP_ECHO) bb_error_msg("warning: got ICMP %d (%s)", diff --git a/networking/ping6.c b/networking/ping6.c index 62dc4cc..a064f2f 100644 --- a/networking/ping6.c +++ b/networking/ping6.c @@ -305,7 +305,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit triptime / 10, triptime % 10); if (dupflag) printf(" (DUP!)"); - printf("\n"); + puts(""); } else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) bb_error_msg("warning: got ICMP %d (%s)", diff --git a/procps/fuser.c b/procps/fuser.c index 4906797..4628cdf 100644 --- a/procps/fuser.c +++ b/procps/fuser.c @@ -277,7 +277,7 @@ static int fuser_print_pid_list(pid_list *plist) if(curr->pid > 0) printf("%d ", curr->pid); curr = curr->next; } - printf("\n"); + puts(""); return 1; } diff --git a/shell/lash.c b/shell/lash.c index c499612..96c0b30 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -678,7 +678,7 @@ static int get_command(FILE * source, char *command) if (!fgets(command, BUFSIZ - 2, source)) { if (source == stdin) - printf("\n"); + puts(""); return 1; } diff --git a/shell/msh.c b/shell/msh.c index cb29471..95b4244 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -3250,7 +3250,7 @@ static int dohelp(struct op *t) continue; col += printf("%s%s", ((col == 0) ? "\t" : " "), x->name); if (col > 60) { - printf("\n"); + puts(""); col = 0; } } @@ -3267,7 +3267,7 @@ static int dohelp(struct op *t) col += printf("%s%s", ((col == 0) ? "\t" : " "), applet->name); if (col > 60) { - printf("\n"); + puts(""); col = 0; } } diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 3061f0d..40a8d1b 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -2534,13 +2534,13 @@ print_buffer(char *pbuffer) printf("0x%03X:", i); printf(" %02X", (unsigned char) pbuffer[i]); if (l == MAX_PER_LINE - 1) { - printf("\n"); + puts(""); l = -1; } } if (l > 0) - printf("\n"); - printf("\n"); + puts(""); + puts(""); } @@ -2650,7 +2650,7 @@ xselect(void) break; case 'q': close(fd); - printf("\n"); + puts(""); exit(0); case 'r': return; @@ -3022,7 +3022,7 @@ int fdisk_main(int argc, char **argv) break; case 'q': close(fd); - printf("\n"); + puts(""); return 0; case 's': #ifdef CONFIG_FEATURE_SUN_LABEL diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index 17267d5..71cf138 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c @@ -512,7 +512,7 @@ xbsd_print_disklabel(int show_all) printf(_(" ecc")); if (lp->d_flags & BSD_D_BADSECT) printf(_(" badsect")); - printf("\n"); + puts(""); /* On various machines the fields of *lp are short/int/long */ /* In order to avoid problems, we cast them all to long. */ printf(_("bytes/sector: %ld\n"), (long) lp->d_secsize); @@ -579,7 +579,7 @@ xbsd_print_disklabel(int show_all) printf("%22.22s", ""); break; } - printf("\n"); + puts(""); } } } diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index a2ca7a5..3ebc58b 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -322,12 +322,12 @@ static int ask(const char *string, int def) int c; if (!repair) { - printf("\n"); + puts(""); errors_uncorrected = 1; return 0; } if (automatic) { - printf("\n"); + puts(""); if (!def) errors_uncorrected = 1; return def; diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 02bb218..17f3c42 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -172,7 +172,7 @@ int generate_output(char * argv[],int argc,const char *optstr, printf(" --"); while (optind < argc) printf(" %s",normalize(argv[optind++])); - printf("\n"); + puts(""); } return exit_code; } -- cgit v1.1