whitespace fixes

This commit is contained in:
Denis Vlasenko 2007-05-30 00:29:55 +00:00
parent 4ef7d3a2de
commit 4b924f3a5c
29 changed files with 82 additions and 82 deletions

View File

@ -692,8 +692,8 @@ int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf,
void dealloc_bunzip(bunzip_data *bd) void dealloc_bunzip(bunzip_data *bd)
{ {
free(bd->dbuf); free(bd->dbuf);
free(bd); free(bd);
} }

View File

@ -632,7 +632,7 @@ static void display_speed(const struct termios *mode, int fancy)
ospeed = ispeed = cfgetispeed(mode); ospeed = ispeed = cfgetispeed(mode);
if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) { if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
ispeed = ospeed; /* in case ispeed was 0 */ ispeed = ospeed; /* in case ispeed was 0 */
//0123 4 5 6 7 8 9 //0123 4 5 6 7 8 9
fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;"; fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;";
} }
if (fancy) fmt_str += 9; if (fancy) fmt_str += 9;

View File

@ -1223,7 +1223,7 @@ int sed_main(int argc, char **argv)
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
if (sizeof(struct globals) > sizeof(bb_common_bufsiz1)) if (sizeof(struct globals) > sizeof(bb_common_bufsiz1))
BUG_sed_globals_too_big(); BUG_sed_globals_too_big();
G.sed_cmd_tail = &G.sed_cmd_head; G.sed_cmd_tail = &G.sed_cmd_head;

View File

@ -578,10 +578,10 @@
"Deallocate unused virtual terminal /dev/ttyN" "Deallocate unused virtual terminal /dev/ttyN"
#define delgroup_trivial_usage \ #define delgroup_trivial_usage \
USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP" USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
#define delgroup_full_usage \ #define delgroup_full_usage \
"Delete group GROUP from the system" \ "Delete group GROUP from the system" \
USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP") USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
#define deluser_trivial_usage \ #define deluser_trivial_usage \
"USER" "USER"
@ -966,7 +966,7 @@
) USE_FEATURE_FIND_EXEC( \ ) USE_FEATURE_FIND_EXEC( \
"\n -exec CMD Execute CMD with all instances of {} replaced by the" \ "\n -exec CMD Execute CMD with all instances of {} replaced by the" \
"\n files matching EXPRESSION" \ "\n files matching EXPRESSION" \
) USE_FEATURE_FIND_USER( \ ) USE_FEATURE_FIND_USER( \
"\n -user NAME File is owned by user NAME (numeric user ID allowed)" \ "\n -user NAME File is owned by user NAME (numeric user ID allowed)" \
) USE_FEATURE_FIND_GROUP( \ ) USE_FEATURE_FIND_GROUP( \
"\n -group NAME File belongs to group NAME (numeric group ID allowed)" \ "\n -group NAME File belongs to group NAME (numeric group ID allowed)" \
@ -976,9 +976,9 @@
"\n -size N File size is N" \ "\n -size N File size is N" \
) USE_FEATURE_FIND_PRUNE( \ ) USE_FEATURE_FIND_PRUNE( \
"\n -prune Stop traversing current subtree" \ "\n -prune Stop traversing current subtree" \
) USE_FEATURE_FIND_DELETE( \ ) USE_FEATURE_FIND_DELETE( \
"\n -delete Delete files; Turns on -depth option" \ "\n -delete Delete files; Turns on -depth option" \
) USE_FEATURE_FIND_PATH( \ ) USE_FEATURE_FIND_PATH( \
"\n -path Path matches PATTERN" \ "\n -path Path matches PATTERN" \
) USE_FEATURE_FIND_PAREN( \ ) USE_FEATURE_FIND_PAREN( \
"\n (EXPR) Group an expression" \ "\n (EXPR) Group an expression" \

View File

@ -31,7 +31,7 @@ unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp)
for (i = 0; i < cclen; ++i) { for (i = 0; i < cclen; ++i) {
if (!cc[i].ip) { if (!cc[i].ip) {
freepos = i; freepos = i;
continue; continue;
} }
if (strcmp(cc[i].ip, ip) == 0) { if (strcmp(cc[i].ip, ip) == 0) {
conn++; conn++;

View File

@ -8,8 +8,8 @@
*/ */
struct hcc { struct hcc {
char *ip; char *ip;
int pid; int pid;
}; };
void ipsvd_perhost_init(unsigned); void ipsvd_perhost_init(unsigned);

View File

@ -39,7 +39,7 @@
#define LENGTH_FW_REV 4 /* 4 words (8 bytes or characters) */ #define LENGTH_FW_REV 4 /* 4 words (8 bytes or characters) */
#define START_MODEL 27 /* ASCII model number */ #define START_MODEL 27 /* ASCII model number */
#define LENGTH_MODEL 20 /* 20 words (40 bytes or characters) */ #define LENGTH_MODEL 20 /* 20 words (40 bytes or characters) */
#define SECTOR_XFER_MAX 47 /* r/w multiple: max sectors xfered */ #define SECTOR_XFER_MAX 47 /* r/w multiple: max sectors xfered */
#define DWORD_IO 48 /* can do double-word IO (ATA-1 only) */ #define DWORD_IO 48 /* can do double-word IO (ATA-1 only) */
#define CAPAB_0 49 /* capabilities */ #define CAPAB_0 49 /* capabilities */
#define CAPAB_1 50 #define CAPAB_1 50
@ -48,7 +48,7 @@
#define WHATS_VALID 53 /* what fields are valid */ #define WHATS_VALID 53 /* what fields are valid */
#define LCYLS_CUR 54 /* current logical cylinders */ #define LCYLS_CUR 54 /* current logical cylinders */
#define LHEADS_CUR 55 /* current logical heads */ #define LHEADS_CUR 55 /* current logical heads */
#define LSECTS_CUR 56 /* current logical sectors/track */ #define LSECTS_CUR 56 /* current logical sectors/track */
#define CAPACITY_LSB 57 /* current capacity in sectors */ #define CAPACITY_LSB 57 /* current capacity in sectors */
#define CAPACITY_MSB 58 #define CAPACITY_MSB 58
#define SECTOR_XFER_CUR 59 /* r/w multiple: current sectors xfered */ #define SECTOR_XFER_CUR 59 /* r/w multiple: current sectors xfered */

View File

@ -37,8 +37,8 @@ int udhcpd_main(int argc, char **argv)
//Huh, dhcpd don't have --foreground, --syslog options?? TODO //Huh, dhcpd don't have --foreground, --syslog options?? TODO
if (!ENABLE_FEATURE_UDHCP_DEBUG) { if (!ENABLE_FEATURE_UDHCP_DEBUG) {
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
logmode &= ~LOGMODE_STDIO; logmode &= ~LOGMODE_STDIO;
} }
if (ENABLE_FEATURE_UDHCP_SYSLOG) { if (ENABLE_FEATURE_UDHCP_SYSLOG) {

View File

@ -123,7 +123,7 @@ int symfilecnt = 0;
void add_new_symbol(struct symfile *sym, char * symname) void add_new_symbol(struct symfile *sym, char * symname)
{ {
sym->symbollist = sym->symbollist =
realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
sym->symbollist[sym->symbolcnt++].name = strdup(symname); sym->symbollist[sym->symbolcnt++].name = strdup(symname);
} }
@ -182,7 +182,7 @@ void find_export_symbols(char * filename)
char *p; char *p;
char *e; char *e;
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) ||
((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) {
/* Skip EXPORT_SYMBOL{_GPL} */ /* Skip EXPORT_SYMBOL{_GPL} */
while (isalnum(*p) || *p == '_') while (isalnum(*p) || *p == '_')
p++; p++;
@ -256,24 +256,24 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
void singfunc(char * filename, char * line) void singfunc(char * filename, char * line)
{ {
char *vec[200]; /* Enough for specific functions */ char *vec[200]; /* Enough for specific functions */
int i, idx = 0; int i, idx = 0;
int startofsym = 1; int startofsym = 1;
vec[idx++] = KERNELDOC; vec[idx++] = KERNELDOC;
vec[idx++] = DOCBOOK; vec[idx++] = DOCBOOK;
/* Split line up in individual parameters preceeded by FUNCTION */ /* Split line up in individual parameters preceeded by FUNCTION */
for (i=0; line[i]; i++) { for (i=0; line[i]; i++) {
if (isspace(line[i])) { if (isspace(line[i])) {
line[i] = '\0'; line[i] = '\0';
startofsym = 1; startofsym = 1;
continue; continue;
} }
if (startofsym) { if (startofsym) {
startofsym = 0; startofsym = 0;
vec[idx++] = FUNCTION; vec[idx++] = FUNCTION;
vec[idx++] = &line[i]; vec[idx++] = &line[i];
} }
} }
vec[idx++] = filename; vec[idx++] = filename;
vec[idx] = NULL; vec[idx] = NULL;
exec_kernel_doc(vec); exec_kernel_doc(vec);
@ -307,14 +307,14 @@ void parse_file(FILE *infile)
break; break;
case 'D': case 'D':
while (*s && !isspace(*s)) s++; while (*s && !isspace(*s)) s++;
*s = '\0'; *s = '\0';
symbolsonly(line+2); symbolsonly(line+2);
break; break;
case 'F': case 'F':
/* filename */ /* filename */
while (*s && !isspace(*s)) s++; while (*s && !isspace(*s)) s++;
*s++ = '\0'; *s++ = '\0';
/* function names */ /* function names */
while (isspace(*s)) while (isspace(*s))
s++; s++;
singlefunctions(line +2, s); singlefunctions(line +2, s);
@ -340,11 +340,11 @@ int main(int argc, char **argv)
} }
/* Open file, exit on error */ /* Open file, exit on error */
infile = fopen(argv[2], "r"); infile = fopen(argv[2], "r");
if (infile == NULL) { if (infile == NULL) {
fprintf(stderr, "docproc: "); fprintf(stderr, "docproc: ");
perror(argv[2]); perror(argv[2]);
exit(2); exit(2);
} }
if (strcmp("doc", argv[1]) == 0) if (strcmp("doc", argv[1]) == 0)
{ {

View File

@ -536,7 +536,7 @@ int main(int ac, char **av)
exit(0); exit(0);
} }
} }
name = av[i]; name = av[i];
if (!name) { if (!name) {
printf(_("%s: Kconfig file missing\n"), av[0]); printf(_("%s: Kconfig file missing\n"), av[0]);
} }

View File

@ -824,7 +824,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
default: default:
; ;
} }
return false; return false;
} }
struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)

View File

@ -1516,7 +1516,7 @@ static void display_tree(struct menu *menu)
&& (tree == tree2)) && (tree == tree2))
continue; continue;
/* /*
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
|| (view_mode == FULL_VIEW) || (view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/ || (view_mode == SPLIT_VIEW))*/
if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT)) if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))

View File

@ -25,8 +25,8 @@ void kconfig_load(void)
#define P(name,type,arg) \ #define P(name,type,arg) \
{ \ { \
name ## _p = dlsym(handle, #name); \ name ## _p = dlsym(handle, #name); \
if ((error = dlerror())) { \ if ((error = dlerror())) { \
fprintf(stderr, "%s\n", error); \ fprintf(stderr, "%s\n", error); \
exit(1); \ exit(1); \
} \ } \
} }

View File

@ -58,10 +58,10 @@ static char *utoa_to_buf(unsigned n, char *buf, unsigned buflen)
for (i = 1000000000; i; i /= 10) { for (i = 1000000000; i; i /= 10) {
res = n / i; res = n / i;
if (res || out || i == 1) { if (res || out || i == 1) {
if (!--buflen) break; if (!--buflen) break;
out++; out++;
n -= res*i; n -= res*i;
*buf++ = '0' + res; *buf++ = '0' + res;
} }
} }
} }