aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-28 12:30:24 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-28 12:30:24 +0100
commit083e172641b64c564b7ec5478197dccbde43b421 (patch)
treeed2cbfa8c4ad1c39a25c84bce8eb6ff224b623ed
parent6b9f1633537e2ff06eb1a0741e4598a294f40fcb (diff)
downloadbusybox-w32-083e172641b64c564b7ec5478197dccbde43b421.tar.gz
busybox-w32-083e172641b64c564b7ec5478197dccbde43b421.tar.bz2
busybox-w32-083e172641b64c564b7ec5478197dccbde43b421.zip
style fixes, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/gzip.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/namei.c2
-rw-r--r--miscutils/devfsd.c12
-rw-r--r--modutils/modutils-24.c2
-rw-r--r--shell/msh_unused.c2
-rw-r--r--util-linux/fdisk_sun.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/archival/gzip.c b/archival/gzip.c
index f9c8e4d4b..a327d5435 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -964,7 +964,7 @@ static void compress_block(ct_data * ltree, ct_data * dtree);
964#else 964#else
965# define SEND_CODE(c, tree) \ 965# define SEND_CODE(c, tree) \
966{ \ 966{ \
967 if (verbose > 1) bb_error_msg("\ncd %3d ",(c)); \ 967 if (verbose > 1) bb_error_msg("\ncd %3d ", (c)); \
968 send_bits(tree[c].Code, tree[c].Len); \ 968 send_bits(tree[c].Code, tree[c].Len); \
969} 969}
970#endif 970#endif
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
index 988967009..4d4e3788c 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
@@ -48,7 +48,7 @@ static errcode_t follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
48 if (link_count++ > 5) { 48 if (link_count++ > 5) {
49 return EXT2_ET_SYMLINK_LOOP; 49 return EXT2_ET_SYMLINK_LOOP;
50 } 50 }
51 if (ext2fs_inode_data_blocks(fs,&ei)) { 51 if (ext2fs_inode_data_blocks(fs, &ei)) {
52 retval = ext2fs_get_mem(fs->blocksize, &buffer); 52 retval = ext2fs_get_mem(fs->blocksize, &buffer);
53 if (retval) 53 if (retval)
54 return retval; 54 return retval;
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 5e3ee23b3..62f5de8b6 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -637,7 +637,7 @@ static int do_servicing(int fd, unsigned long event_mask)
637 xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask); 637 xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
638 while (!caught_signal) { 638 while (!caught_signal) {
639 errno = 0; 639 errno = 0;
640 bytes = read(fd,(char *) &info, sizeof info); 640 bytes = read(fd, (char *) &info, sizeof info);
641 if (caught_signal) 641 if (caught_signal)
642 break; /* Must test for this first */ 642 break; /* Must test for this first */
643 if (errno == EINTR) 643 if (errno == EINTR)
@@ -941,10 +941,10 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
941 lstat(dpath, &dest_stat); 941 lstat(dpath, &dest_stat);
942 free(dpath); 942 free(dpath);
943 if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX)) 943 if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
944 copy_inode(dpath, &dest_stat,(source_stat.st_mode & ~S_ISVTX) , spath, &source_stat); 944 copy_inode(dpath, &dest_stat, (source_stat.st_mode & ~S_ISVTX), spath, &source_stat);
945 945
946 if (S_ISDIR(source_stat.st_mode)) 946 if (S_ISDIR(source_stat.st_mode))
947 dir_operation(RESTORE, spath, rootlen,NULL); 947 dir_operation(RESTORE, spath, rootlen, NULL);
948} 948}
949 949
950 950
@@ -995,7 +995,7 @@ static int copy_inode(const char *destpath, const struct stat *dest_stat,
995 break; 995 break;
996 un_addr.sun_family = AF_UNIX; 996 un_addr.sun_family = AF_UNIX;
997 snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath); 997 snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath);
998 val = bind(fd,(struct sockaddr *) &un_addr,(int) sizeof un_addr); 998 val = bind(fd, (struct sockaddr *) &un_addr, (int) sizeof un_addr);
999 close(fd); 999 close(fd);
1000 if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0) 1000 if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
1001 break; 1001 break;
@@ -1432,7 +1432,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
1432 1432
1433 /* 2 ==scsi/disc, 4 == scsi/part */ 1433 /* 2 ==scsi/disc, 4 == scsi/part */
1434 if (i == 2 || i == 4) 1434 if (i == 2 || i == 4)
1435 compat_name = write_old_sd_name(buffer, major, minor,((i == 2) ? "" : (ptr + 4))); 1435 compat_name = write_old_sd_name(buffer, major, minor, ((i == 2) ? "" : (ptr + 4)));
1436 1436
1437 /* 5 == scsi/mt */ 1437 /* 5 == scsi/mt */
1438 if (i == 5) { 1438 if (i == 5) {
@@ -1652,7 +1652,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
1652 ch = input[0]; 1652 ch = input[0];
1653 if (ch == '$') { 1653 if (ch == '$') {
1654 /* Special case for "$$": PID */ 1654 /* Special case for "$$": PID */
1655 sprintf(tmp, "%d",(int) getpid()); 1655 sprintf(tmp, "%d", (int) getpid());
1656 len = strlen(tmp); 1656 len = strlen(tmp);
1657 if (len + *out_pos >= length) 1657 if (len + *out_pos >= length)
1658 goto expand_variable_out; 1658 goto expand_variable_out;
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index 4ede01fe8..442e80f2f 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -1570,7 +1570,7 @@ arch_apply_relocation(struct obj_file *f,
1570#endif 1570#endif
1571 1571
1572 default: 1572 default:
1573 printf("Warning: unhandled reloc %d\n",(int)ELF_R_TYPE(rel->r_info)); 1573 printf("Warning: unhandled reloc %d\n", (int)ELF_R_TYPE(rel->r_info));
1574 ret = obj_reloc_unhandled; 1574 ret = obj_reloc_unhandled;
1575 break; 1575 break;
1576 1576
diff --git a/shell/msh_unused.c b/shell/msh_unused.c
index 54680226a..fe2cca816 100644
--- a/shell/msh_unused.c
+++ b/shell/msh_unused.c
@@ -464,7 +464,7 @@ static void ioecho(char c);
464 * IO control 464 * IO control
465 */ 465 */
466static void pushio(struct ioarg *argp, int (*f) (struct ioarg *)); 466static void pushio(struct ioarg *argp, int (*f) (struct ioarg *));
467#define PUSHIO(what,arg,gen) ((temparg.what = (arg)), pushio(&temparg,(gen))) 467#define PUSHIO(what,arg,gen) ((temparg.what = (arg)), pushio(&temparg, (gen)))
468static int remap(int fd); 468static int remap(int fd);
469static int openpipe(int *pv); 469static int openpipe(int *pv);
470static void closepipe(int *pv); 470static void closepipe(int *pv);
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index fa6f7e48b..463082f6a 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -480,7 +480,7 @@ add_sun_partition(int n, int sys)
480 return; 480 return;
481 } 481 }
482 482
483 fetch_sun(starts,lens,&start,&stop); 483 fetch_sun(starts, lens, &start, &stop);
484 if (stop <= start) { 484 if (stop <= start) {
485 if (n == 2) 485 if (n == 2)
486 whole_disk = 1; 486 whole_disk = 1;