mirrors/busybox
0
0
Fork 0
mirror of https://git.busybox.net/busybox.git synced 2024-11-23 21:53:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

small style fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-12 19:29:44 +00:00
parent 12f5676cce
commit a6dbb08a48
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/dpkg.c
View File

@ -878,7 +878,8 @@ static void write_status_file(deb_file_t **deb_file)
/* remove trailing \n's */
write_buffer_no_status(new_status_file, deb_file[i]->control_file);
set_status(status_num, "ok", 2);
fprintf(new_status_file, "Status: %s\n\n", name_hashtable[status_hashtable[status_num]->status]);
fprintf(new_status_file, "Status: %s\n\n",
name_hashtable[status_hashtable[status_num]->status]);
write_flag = TRUE;
break;
}
@ -886,7 +887,9 @@ static void write_status_file(deb_file_t **deb_file)
}
/* This is temperary, debugging only */
if (deb_file[i] == NULL) {
bb_error_msg_and_die("ALERT: Couldnt find a control file, your status file may be broken, status may be incorrect for %s", package_name);
bb_error_msg_and_die("ALERT: cannot find a control file, "
"your status file may be broken, status may be "
"incorrect for %s", package_name);
}
}
else if (strcmp("not-installed", name_hashtable[state_status]) == 0) {
@ -963,7 +966,8 @@ static void write_status_file(deb_file_t **deb_file)
}
if (rename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status") == -1) {
bb_error_msg_and_die("DANGER: Cannot create status file, you need to manually repair your status file");
bb_error_msg_and_die("DANGER: cannot create status file, "
"you need to manually repair your status file");
}
}

2
archival/tar.c
View File

@ -499,7 +499,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag,
bb_error_msg("Error exit delayed from previous errors");
if (gzipPid && waitpid(gzipPid, NULL, 0)==-1)
bb_error_msg("Couldnt wait");
bb_error_msg("cannot wait");
return !errorFlag;
}

6
editors/patch.c
View File

@ -147,7 +147,7 @@ int patch_main(int argc, char **argv)
strcpy(backup_filename, new_filename);
strcat(backup_filename, ".orig");
if (rename(new_filename, backup_filename) == -1) {
bb_perror_msg_and_die("Couldnt create file %s",
bb_perror_msg_and_die("cannot create file %s",
backup_filename);
}
dst_stream = xfopen(new_filename, "w");
@ -256,10 +256,10 @@ int patch_main(int argc, char **argv)
if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
/* The new patched file is empty, remove it */
if (unlink(new_filename) == -1) {
bb_perror_msg_and_die("Couldnt remove file %s", new_filename);
bb_perror_msg_and_die("cannot remove file %s", new_filename);
}
if (unlink(original_filename) == -1) {
bb_perror_msg_and_die("Couldnt remove original file %s", new_filename);
bb_perror_msg_and_die("cannot remove original file %s", new_filename);
}
}
}

8
libbb/fgets_str.c
View File

@ -44,12 +44,14 @@ char *fgets_str(FILE *file, const char *terminating_string)
/* Check for terminating string */
end_string_offset = idx - term_length;
if ((end_string_offset > 0) && (memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0)) {
if (end_string_offset > 0
&& memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0
) {
idx -= term_length;
break;
}
}
linebuf = xrealloc(linebuf, idx + 1);
linebuf[idx] = '\0';
return(linebuf);
return linebuf;
}

3
libbb/procps.c
View File

@ -54,7 +54,8 @@ procps_status_t * procps_scan(int save_user_arg0)
dir = xopendir("/proc");
}
for (;;) {
if ((entry = readdir(dir)) == NULL) {
entry = readdir(dir);
if (entry == NULL) {
closedir(dir);
dir = 0;
return 0;

3
libbb/xfuncs.c
View File

@ -137,7 +137,8 @@ void xwrite(int fd, void *buf, size_t count)
// Die with an error message if we can't lseek to the right spot.
void xlseek(int fd, off_t offset, int whence)
{
if (offset != lseek(fd, offset, whence)) bb_error_msg_and_die("lseek");
if (offset != lseek(fd, offset, whence))
bb_error_msg_and_die("lseek");
}
// Die with an error message if we can't read one character.

2
networking/ftpgetput.c
View File

@ -78,7 +78,7 @@ static FILE *ftp_login(ftp_host_info_t *server)
/* Connect to the command socket */
control_stream = fdopen(xconnect(server->s_in), "r+");
if (control_stream == NULL) {
bb_perror_msg_and_die("Couldnt open control stream");
bb_perror_msg_and_die("cannot open control stream");
}
if (ftpcmd(NULL, NULL, control_stream, buf) != 220) {

6
networking/udhcp/dhcpc.c
View File

@ -448,7 +448,7 @@ int udhcpc_main(int argc, char *argv[])
}
if ((message = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
bb_error_msg("Couldnt get option from packet - ignoring");
bb_error_msg("cannot get option from packet - ignoring");
continue;
}
@ -467,7 +467,7 @@ int udhcpc_main(int argc, char *argv[])
timeout = now;
packet_num = 0;
} else {
bb_error_msg("No server ID in message");
bb_error_msg("no server ID in message");
}
}
break;
@ -478,7 +478,7 @@ int udhcpc_main(int argc, char *argv[])
if (*message == DHCPACK) {
temp = get_option(&packet, DHCP_LEASE_TIME);
if (!temp) {
bb_error_msg("No lease time with ACK, using 1 hour lease");
bb_error_msg("no lease time with ACK, using 1 hour lease");
lease = 60 * 60;
} else {
lease = ntohl(*(uint32_t*)temp);