diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-19 22:50:47 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-19 22:50:47 +0000 |
commit | 2f6ae43b9c74d393a139007377895e8c50b8af9a (patch) | |
tree | 1f899a31345033e8a808de680a37f3cd3f13a656 | |
parent | 2a86a61c270a7d64bcc18a81b0d9004699b1be0f (diff) | |
download | busybox-w32-2f6ae43b9c74d393a139007377895e8c50b8af9a.tar.gz busybox-w32-2f6ae43b9c74d393a139007377895e8c50b8af9a.tar.bz2 busybox-w32-2f6ae43b9c74d393a139007377895e8c50b8af9a.zip |
stray trailing tabs removed
-rw-r--r-- | editors/vi.c | 8 | ||||
-rw-r--r-- | libbb/procps.c | 4 | ||||
-rw-r--r-- | libbb/xfuncs.c | 4 | ||||
-rw-r--r-- | miscutils/devfsd.c | 4 | ||||
-rw-r--r-- | miscutils/runlevel.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/editors/vi.c b/editors/vi.c index 6faaef36e..97efe0cfb 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -414,7 +414,7 @@ static int init_text_buffer(char *fn) | |||
414 | if (text_size < 10240) | 414 | if (text_size < 10240) |
415 | text_size = 10240; // have a minimum size for new files | 415 | text_size = 10240; // have a minimum size for new files |
416 | screenbegin = dot = end = text = xzalloc(text_size); | 416 | screenbegin = dot = end = text = xzalloc(text_size); |
417 | 417 | ||
418 | if (fn != current_filename) { | 418 | if (fn != current_filename) { |
419 | free(current_filename); | 419 | free(current_filename); |
420 | current_filename = xstrdup(fn); | 420 | current_filename = xstrdup(fn); |
@@ -434,7 +434,7 @@ static int init_text_buffer(char *fn) | |||
434 | memset(mark, 0, sizeof(mark)); | 434 | memset(mark, 0, sizeof(mark)); |
435 | #endif | 435 | #endif |
436 | return rc; | 436 | return rc; |
437 | } | 437 | } |
438 | 438 | ||
439 | static void edit_file(char * fn) | 439 | static void edit_file(char * fn) |
440 | { | 440 | { |
@@ -2210,7 +2210,7 @@ static char readit(void) // read (maybe cursor) key from stdin | |||
2210 | if (errno == EINTR) | 2210 | if (errno == EINTR) |
2211 | goto ri0; // interrupted sys call | 2211 | goto ri0; // interrupted sys call |
2212 | if (errno == EBADF || errno == EFAULT || errno == EINVAL | 2212 | if (errno == EBADF || errno == EFAULT || errno == EINVAL |
2213 | || errno == EIO) | 2213 | || errno == EIO) |
2214 | editing = 0; | 2214 | editing = 0; |
2215 | errno = 0; | 2215 | errno = 0; |
2216 | } | 2216 | } |
@@ -2426,7 +2426,7 @@ static int file_insert(const char * fn, char *p | |||
2426 | * so we check fileperms too */ | 2426 | * so we check fileperms too */ |
2427 | !(statbuf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))) | 2427 | !(statbuf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))) |
2428 | { | 2428 | { |
2429 | SET_READONLY_FILE(readonly_mode); | 2429 | SET_READONLY_FILE(readonly_mode); |
2430 | } | 2430 | } |
2431 | return cnt; | 2431 | return cnt; |
2432 | } | 2432 | } |
diff --git a/libbb/procps.c b/libbb/procps.c index 9817a1288..37593700a 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
@@ -170,8 +170,8 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags) | |||
170 | if (flags & PSSCAN_CONTEXT) { | 170 | if (flags & PSSCAN_CONTEXT) { |
171 | if (getpidcon(sp->pid, &sp->context) < 0) | 171 | if (getpidcon(sp->pid, &sp->context) < 0) |
172 | sp->context = NULL; | 172 | sp->context = NULL; |
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | filename_tail = filename + sprintf(filename, "/proc/%d", pid); | 176 | filename_tail = filename + sprintf(filename, "/proc/%d", pid); |
177 | 177 | ||
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index fad111aa9..177247c6b 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -670,7 +670,7 @@ int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...) | |||
670 | int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name) | 670 | int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name) |
671 | { | 671 | { |
672 | int ret; | 672 | int ret; |
673 | 673 | ||
674 | ret = ioctl(fd, request, argp); | 674 | ret = ioctl(fd, request, argp); |
675 | if (ret < 0) | 675 | if (ret < 0) |
676 | bb_perror_msg("%s", ioctl_name); | 676 | bb_perror_msg("%s", ioctl_name); |
@@ -685,7 +685,7 @@ void bb_xioctl(int fd, int request, void *argp, const char *ioctl_name) | |||
685 | int bb_ioctl_or_warn(int fd, int request, void *argp) | 685 | int bb_ioctl_or_warn(int fd, int request, void *argp) |
686 | { | 686 | { |
687 | int ret; | 687 | int ret; |
688 | 688 | ||
689 | ret = ioctl(fd, request, argp); | 689 | ret = ioctl(fd, request, argp); |
690 | if (ret < 0) | 690 | if (ret < 0) |
691 | bb_perror_msg("ioctl %#x failed", request); | 691 | bb_perror_msg("ioctl %#x failed", request); |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 49eee9be4..d8730459b 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -416,7 +416,7 @@ int devfsd_main(int argc, char **argv) | |||
416 | 416 | ||
417 | if (ENABLE_DEVFSD_FG_NP && no_polling) | 417 | if (ENABLE_DEVFSD_FG_NP && no_polling) |
418 | exit(0); | 418 | exit(0); |
419 | 419 | ||
420 | if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG) | 420 | if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG) |
421 | logmode = LOGMODE_BOTH; | 421 | logmode = LOGMODE_BOTH; |
422 | else if (do_daemon == TRUE) | 422 | else if (do_daemon == TRUE) |
@@ -432,7 +432,7 @@ int devfsd_main(int argc, char **argv) | |||
432 | } else if (ENABLE_DEVFSD_FG_NP) { | 432 | } else if (ENABLE_DEVFSD_FG_NP) { |
433 | setpgid(0, 0); /* Become process group leader */ | 433 | setpgid(0, 0); /* Become process group leader */ |
434 | } | 434 | } |
435 | 435 | ||
436 | while (TRUE) { | 436 | while (TRUE) { |
437 | do_scan = do_servicing(fd, event_mask); | 437 | do_scan = do_servicing(fd, event_mask); |
438 | 438 | ||
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c index 0aabfb024..f51a647be 100644 --- a/miscutils/runlevel.c +++ b/miscutils/runlevel.c | |||
@@ -36,7 +36,7 @@ int runlevel_main(int argc, char **argv) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | puts("unknown"); | 38 | puts("unknown"); |
39 | 39 | ||
40 | if (ENABLE_FEATURE_CLEAN_UP) | 40 | if (ENABLE_FEATURE_CLEAN_UP) |
41 | endutent(); | 41 | endutent(); |
42 | return 1; | 42 | return 1; |