svn commit: trunk/busybox: archival coreutils libbb miscutils netwo etc...

vda at busybox.net vda at busybox.net
Mon Oct 1 05:05:12 PDT 2007


Author: vda
Date: 2007-10-01 05:05:12 -0700 (Mon, 01 Oct 2007)
New Revision: 20160

Log:
printf("%s\n") -> puts()



Modified:
   trunk/busybox/archival/unzip.c
   trunk/busybox/coreutils/id.c
   trunk/busybox/libbb/lineedit.c
   trunk/busybox/miscutils/hdparm.c
   trunk/busybox/networking/nslookup.c
   trunk/busybox/selinux/matchpathcon.c
   trunk/busybox/util-linux/losetup.c


Changeset:
Modified: trunk/busybox/archival/unzip.c
===================================================================
--- trunk/busybox/archival/unzip.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/archival/unzip.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -263,9 +263,9 @@
 			total_size += zip_header.formatted.ucmpsize;
 
 			if (listing) { /* List entry */
-			    if (verbose) {
-				unsigned int dostime = zip_header.formatted.modtime | (zip_header.formatted.moddate << 16);
-				printf("%9u  %02u-%02u-%02u %02u:%02u   %s\n",
+				if (verbose) {
+					unsigned int dostime = zip_header.formatted.modtime | (zip_header.formatted.moddate << 16);
+					printf("%9u  %02u-%02u-%02u %02u:%02u   %s\n",
 					   zip_header.formatted.ucmpsize,
 					   (dostime & 0x01e00000) >> 21,
 					   (dostime & 0x001f0000) >> 16,
@@ -273,12 +273,12 @@
 					   (dostime & 0x0000f800) >> 11,
 					   (dostime & 0x000007e0) >> 5,
 					   dst_fn);
-				total_entries++;
-			    } else {
-				/* short listing -- filenames only */
-				printf("%s\n", dst_fn);
-			    }
-			    i = 'n';
+					total_entries++;
+				} else {
+					/* short listing -- filenames only */
+					puts(dst_fn);
+				}
+				i = 'n';
 			} else if (dst_fd == STDOUT_FILENO) { /* Extracting to STDOUT */
 				i = -1;
 			} else if (last_char_is(dst_fn, '/')) { /* Extract directory */

Modified: trunk/busybox/coreutils/id.c
===================================================================
--- trunk/busybox/coreutils/id.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/coreutils/id.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -92,7 +92,7 @@
 			if (getcon(&scontext)) {
 				bb_error_msg_and_die("can't get process context");
 			}
-			printf("%s\n", scontext);
+			puts(scontext);
 		}
 #endif
 		/* exit */

Modified: trunk/busybox/libbb/lineedit.c
===================================================================
--- trunk/busybox/libbb/lineedit.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/libbb/lineedit.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -700,7 +700,7 @@
 			printf("%s%-*s", matches[n],
 				(int)(column_width - strlen(matches[n])), "");
 		}
-		printf("%s\n", matches[n]);
+		puts(matches[n]);
 	}
 }
 

Modified: trunk/busybox/miscutils/hdparm.c
===================================================================
--- trunk/busybox/miscutils/hdparm.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/miscutils/hdparm.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -849,7 +849,7 @@
 				jj >>= 1;
 			}
 		}
-		printf("%s\n", kk ? "" : "\n\tLikely used CD-ROM ATAPI-1");
+		puts(kk ? "" : "\n\tLikely used CD-ROM ATAPI-1");
 		/* the cdrom stuff is more like ATA-2 than anything else, so: */
 		like_std = 2;
 	}

Modified: trunk/busybox/networking/nslookup.c
===================================================================
--- trunk/busybox/networking/nslookup.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/networking/nslookup.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -69,7 +69,7 @@
 		unsigned cnt = 0;
 
 		printf("%-10s %s\n", header, hostname);
-		// printf("%s\n", cur->ai_canonname); ?
+		// puts(cur->ai_canonname); ?
 		while (cur) {
 			char *dotted, *revhost;
 			dotted = xmalloc_sockaddr2dotted_noport(cur->ai_addr);

Modified: trunk/busybox/selinux/matchpathcon.c
===================================================================
--- trunk/busybox/selinux/matchpathcon.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/selinux/matchpathcon.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -17,7 +17,7 @@
 	if (!noprint)
 		printf("%s\t%s\n", path, buf);
 	else
-		printf("%s\n", buf);
+		puts(buf);
 
 	freecon(buf);
 	return 0;

Modified: trunk/busybox/util-linux/losetup.c
===================================================================
--- trunk/busybox/util-linux/losetup.c	2007-10-01 11:58:38 UTC (rev 20159)
+++ trunk/busybox/util-linux/losetup.c	2007-10-01 12:05:12 UTC (rev 20160)
@@ -64,7 +64,7 @@
 		s = query_loop(dev);
 		if (!s) {
 			if (opt == 0x4) {
-				printf("%s\n", dev);
+				puts(dev);
 				return EXIT_SUCCESS;
 			}
 		} else {



More information about the busybox-cvs mailing list