style fixes, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
6b9f163353
commit
083e172641
@ -964,7 +964,7 @@ static void compress_block(ct_data * ltree, ct_data * dtree);
|
|||||||
#else
|
#else
|
||||||
# define SEND_CODE(c, tree) \
|
# define SEND_CODE(c, tree) \
|
||||||
{ \
|
{ \
|
||||||
if (verbose > 1) bb_error_msg("\ncd %3d ",(c)); \
|
if (verbose > 1) bb_error_msg("\ncd %3d ", (c)); \
|
||||||
send_bits(tree[c].Code, tree[c].Len); \
|
send_bits(tree[c].Code, tree[c].Len); \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -48,7 +48,7 @@ static errcode_t follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
|
|||||||
if (link_count++ > 5) {
|
if (link_count++ > 5) {
|
||||||
return EXT2_ET_SYMLINK_LOOP;
|
return EXT2_ET_SYMLINK_LOOP;
|
||||||
}
|
}
|
||||||
if (ext2fs_inode_data_blocks(fs,&ei)) {
|
if (ext2fs_inode_data_blocks(fs, &ei)) {
|
||||||
retval = ext2fs_get_mem(fs->blocksize, &buffer);
|
retval = ext2fs_get_mem(fs->blocksize, &buffer);
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
|
@ -637,7 +637,7 @@ static int do_servicing(int fd, unsigned long event_mask)
|
|||||||
xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
|
xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
|
||||||
while (!caught_signal) {
|
while (!caught_signal) {
|
||||||
errno = 0;
|
errno = 0;
|
||||||
bytes = read(fd,(char *) &info, sizeof info);
|
bytes = read(fd, (char *) &info, sizeof info);
|
||||||
if (caught_signal)
|
if (caught_signal)
|
||||||
break; /* Must test for this first */
|
break; /* Must test for this first */
|
||||||
if (errno == EINTR)
|
if (errno == EINTR)
|
||||||
@ -941,10 +941,10 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
|
|||||||
lstat(dpath, &dest_stat);
|
lstat(dpath, &dest_stat);
|
||||||
free(dpath);
|
free(dpath);
|
||||||
if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
|
if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
|
||||||
copy_inode(dpath, &dest_stat,(source_stat.st_mode & ~S_ISVTX) , spath, &source_stat);
|
copy_inode(dpath, &dest_stat, (source_stat.st_mode & ~S_ISVTX), spath, &source_stat);
|
||||||
|
|
||||||
if (S_ISDIR(source_stat.st_mode))
|
if (S_ISDIR(source_stat.st_mode))
|
||||||
dir_operation(RESTORE, spath, rootlen,NULL);
|
dir_operation(RESTORE, spath, rootlen, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -995,7 +995,7 @@ static int copy_inode(const char *destpath, const struct stat *dest_stat,
|
|||||||
break;
|
break;
|
||||||
un_addr.sun_family = AF_UNIX;
|
un_addr.sun_family = AF_UNIX;
|
||||||
snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath);
|
snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath);
|
||||||
val = bind(fd,(struct sockaddr *) &un_addr,(int) sizeof un_addr);
|
val = bind(fd, (struct sockaddr *) &un_addr, (int) sizeof un_addr);
|
||||||
close(fd);
|
close(fd);
|
||||||
if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
|
if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
|
||||||
break;
|
break;
|
||||||
@ -1432,7 +1432,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
|
|||||||
|
|
||||||
/* 2 ==scsi/disc, 4 == scsi/part */
|
/* 2 ==scsi/disc, 4 == scsi/part */
|
||||||
if (i == 2 || i == 4)
|
if (i == 2 || i == 4)
|
||||||
compat_name = write_old_sd_name(buffer, major, minor,((i == 2) ? "" : (ptr + 4)));
|
compat_name = write_old_sd_name(buffer, major, minor, ((i == 2) ? "" : (ptr + 4)));
|
||||||
|
|
||||||
/* 5 == scsi/mt */
|
/* 5 == scsi/mt */
|
||||||
if (i == 5) {
|
if (i == 5) {
|
||||||
@ -1652,7 +1652,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
|
|||||||
ch = input[0];
|
ch = input[0];
|
||||||
if (ch == '$') {
|
if (ch == '$') {
|
||||||
/* Special case for "$$": PID */
|
/* Special case for "$$": PID */
|
||||||
sprintf(tmp, "%d",(int) getpid());
|
sprintf(tmp, "%d", (int) getpid());
|
||||||
len = strlen(tmp);
|
len = strlen(tmp);
|
||||||
if (len + *out_pos >= length)
|
if (len + *out_pos >= length)
|
||||||
goto expand_variable_out;
|
goto expand_variable_out;
|
||||||
|
@ -1570,7 +1570,7 @@ arch_apply_relocation(struct obj_file *f,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
printf("Warning: unhandled reloc %d\n",(int)ELF_R_TYPE(rel->r_info));
|
printf("Warning: unhandled reloc %d\n", (int)ELF_R_TYPE(rel->r_info));
|
||||||
ret = obj_reloc_unhandled;
|
ret = obj_reloc_unhandled;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -464,7 +464,7 @@ static void ioecho(char c);
|
|||||||
* IO control
|
* IO control
|
||||||
*/
|
*/
|
||||||
static void pushio(struct ioarg *argp, int (*f) (struct ioarg *));
|
static void pushio(struct ioarg *argp, int (*f) (struct ioarg *));
|
||||||
#define PUSHIO(what,arg,gen) ((temparg.what = (arg)), pushio(&temparg,(gen)))
|
#define PUSHIO(what,arg,gen) ((temparg.what = (arg)), pushio(&temparg, (gen)))
|
||||||
static int remap(int fd);
|
static int remap(int fd);
|
||||||
static int openpipe(int *pv);
|
static int openpipe(int *pv);
|
||||||
static void closepipe(int *pv);
|
static void closepipe(int *pv);
|
||||||
|
@ -480,7 +480,7 @@ add_sun_partition(int n, int sys)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
fetch_sun(starts,lens,&start,&stop);
|
fetch_sun(starts, lens, &start, &stop);
|
||||||
if (stop <= start) {
|
if (stop <= start) {
|
||||||
if (n == 2)
|
if (n == 2)
|
||||||
whole_disk = 1;
|
whole_disk = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user