style fixes, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@ -637,7 +637,7 @@ static int do_servicing(int fd, unsigned long event_mask)
|
||||
xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
|
||||
while (!caught_signal) {
|
||||
errno = 0;
|
||||
bytes = read(fd,(char *) &info, sizeof info);
|
||||
bytes = read(fd, (char *) &info, sizeof info);
|
||||
if (caught_signal)
|
||||
break; /* Must test for this first */
|
||||
if (errno == EINTR)
|
||||
@ -941,10 +941,10 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
|
||||
lstat(dpath, &dest_stat);
|
||||
free(dpath);
|
||||
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))
|
||||
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;
|
||||
un_addr.sun_family = AF_UNIX;
|
||||
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);
|
||||
if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
|
||||
break;
|
||||
@ -1432,7 +1432,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
|
||||
|
||||
/* 2 ==scsi/disc, 4 == scsi/part */
|
||||
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 */
|
||||
if (i == 5) {
|
||||
@ -1652,7 +1652,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
|
||||
ch = input[0];
|
||||
if (ch == '$') {
|
||||
/* Special case for "$$": PID */
|
||||
sprintf(tmp, "%d",(int) getpid());
|
||||
sprintf(tmp, "%d", (int) getpid());
|
||||
len = strlen(tmp);
|
||||
if (len + *out_pos >= length)
|
||||
goto expand_variable_out;
|
||||
|
Reference in New Issue
Block a user