miscellaneous: clean up trailing whitespace once again

An earlier commit attempted to cleanse our environment
of all useless trailing whitespace. But the effort did
not catch 'empty' lines with a single space before ^J.

This commit hopefully finishes off the earlier effort.
In the meantime, let's pray that contributors' editors
are configured so that such wasted crap is disallowed!

Reference(s):
commit fe75e26ab6

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2013-03-31 00:00:00 -05:00 committed by Craig Small
parent 293b668d5f
commit 7888f6a679
12 changed files with 29 additions and 30 deletions

View File

@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does. and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's 1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an you conspicuously and appropriately publish on each copy an

View File

@ -145,9 +145,9 @@ Error: OVERRUN_STATIC:
Thus it (39th element) cannot be used in referencing Fieldstab. Thus it (39th element) cannot be used in referencing Fieldstab.
However, two enums of higher value (X_XON=40 and X_XOF=41) *can* appear in those arrays. However, two enums of higher value (X_XON=40 and X_XOF=41) *can* appear in those arrays.
But the test against the fencepost ensures that those two enums are *never* used in referencing Fieldstab. But the test against the fencepost ensures that those two enums are *never* used in referencing Fieldstab.
When the analyzer sees the conditional using '<' and not '<=' it reports a false positive. When the analyzer sees the conditional using '<' and not '<=' it reports a false positive.
i'm tired of explaining this so the program was changed to accommodate the tool's deficiency i'm tired of explaining this so the program was changed to accommodate the tool's deficiency
my_category: unavoidable_false_positive_but_patched_anyway my_category: unavoidable_false_positive_but_patched_anyway
top.c:1417: overrun-local: Overrunning static array "Fieldstab", with 39 elements, at position 39 with index variable "f". top.c:1417: overrun-local: Overrunning static array "Fieldstab", with 39 elements, at position 39 with index variable "f".

View File

@ -65,7 +65,7 @@ int main (int argc, char **argv) {
exit(1); exit(1);
} }
if (list) { if (list) {
ut = fopen(UTMP_FILE, "r"); ut = fopen(UTMP_FILE, "r");
while (fread(&uts, sizeof(uts), 1, ut)) while (fread(&uts, sizeof(uts), 1, ut))
@ -106,7 +106,7 @@ int main (int argc, char **argv) {
printf("ut_user: %s\n", user); printf("ut_user: %s\n", user);
printf("ut_host: %s\n", host); printf("ut_host: %s\n", host);
printf("ut_addr: %d\n\n", uts.ut_addr); printf("ut_addr: %d\n\n", uts.ut_addr);
printf("Modify this record? (y/N): "); fflush(stdout); printf("Modify this record? (y/N): "); fflush(stdout);
/* Ask if to delete or no */ /* Ask if to delete or no */
if ((ch = getchar()) == 'y' || ch == 'Y') { if ((ch = getchar()) == 'y' || ch == 'Y') {

View File

@ -451,7 +451,7 @@ static struct el * select_procs (int *num)
if (opt_newest) saved_pid = 0; if (opt_newest) saved_pid = 0;
if (opt_oldest) saved_pid = INT_MAX; if (opt_oldest) saved_pid = INT_MAX;
memset(&task, 0, sizeof (task)); memset(&task, 0, sizeof (task));
while(readproc(ptp, &task)) { while(readproc(ptp, &task)) {
int match = 1; int match = 1;
@ -583,7 +583,7 @@ static struct el * select_procs (int *num)
} }
@ -663,9 +663,9 @@ static void parse_opts (int argc, char **argv)
/* These options are for pgrep only */ /* These options are for pgrep only */
strcat (opts, "lad:vw"); strcat (opts, "lad:vw");
} }
strcat (opts, "LF:cfnoxP:g:s:u:U:G:t:?Vh"); strcat (opts, "LF:cfnoxP:g:s:u:U:G:t:?Vh");
while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != -1) { while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != -1) {
switch (opt) { switch (opt) {
case SIGNAL_OPTION: case SIGNAL_OPTION:

View File

@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does. and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's 1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an you conspicuously and appropriately publish on each copy an

View File

@ -37,20 +37,20 @@ static int escape_str_utf8(char *restrict dst, const char *restrict src, int buf
int my_cells = 0; int my_cells = 0;
int my_bytes = 0; int my_bytes = 0;
mbstate_t s; mbstate_t s;
memset(&s, 0, sizeof (s)); memset(&s, 0, sizeof (s));
for(;;) { for(;;) {
wchar_t wc; wchar_t wc;
int len = 0; int len = 0;
if(my_cells >= *maxcells || my_bytes+1 >= bufsize) if(my_cells >= *maxcells || my_bytes+1 >= bufsize)
break; break;
if (!(len = mbrtowc (&wc, src, MB_CUR_MAX, &s))) if (!(len = mbrtowc (&wc, src, MB_CUR_MAX, &s)))
/* 'str' contains \0 */ /* 'str' contains \0 */
break; break;
if (len < 0) { if (len < 0) {
/* invalid multibyte sequence -- zeroize state */ /* invalid multibyte sequence -- zeroize state */
memset (&s, 0, sizeof (s)); memset (&s, 0, sizeof (s));
@ -65,7 +65,7 @@ static int escape_str_utf8(char *restrict dst, const char *restrict src, int buf
src+=len; src+=len;
my_cells++; my_cells++;
my_bytes++; my_bytes++;
} else { } else {
/* multibyte - printable */ /* multibyte - printable */
int wlen = wcwidth(wc); int wlen = wcwidth(wc);
@ -103,7 +103,7 @@ static int escape_str_utf8(char *restrict dst, const char *restrict src, int buf
*dst = '\0'; *dst = '\0';
// fprintf(stderr, "maxcells: %d, my_cells; %d\n", *maxcells, my_cells); // fprintf(stderr, "maxcells: %d, my_cells; %d\n", *maxcells, my_cells);
*maxcells -= my_cells; *maxcells -= my_cells;
return my_bytes; // bytes of text, excluding the NUL return my_bytes; // bytes of text, excluding the NUL
} }
@ -124,10 +124,10 @@ int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *m
"????????????????????????????????" "????????????????????????????????"
"????????????????????????????????" "????????????????????????????????"
"????????????????????????????????"; "????????????????????????????????";
#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) #if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__))
static int utf_init=0; static int utf_init=0;
if(utf_init==0){ if(utf_init==0){
/* first call -- check if UTF stuff is usable */ /* first call -- check if UTF stuff is usable */
char *enc = nl_langinfo(CODESET); char *enc = nl_langinfo(CODESET);
@ -138,7 +138,7 @@ int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *m
return escape_str_utf8(dst, src, bufsize, maxcells); return escape_str_utf8(dst, src, bufsize, maxcells);
} }
#endif #endif
if(bufsize > *maxcells+1) bufsize=*maxcells+1; // FIXME: assumes 8-bit locale if(bufsize > *maxcells+1) bufsize=*maxcells+1; // FIXME: assumes 8-bit locale
for(;;){ for(;;){
@ -152,7 +152,7 @@ int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *m
*(dst++) = c; *(dst++) = c;
} }
*dst = '\0'; *dst = '\0';
*maxcells -= my_cells; *maxcells -= my_cells;
return my_bytes; // bytes of text, excluding the NUL return my_bytes; // bytes of text, excluding the NUL
} }

View File

@ -146,7 +146,7 @@ static int parse_slabinfo20(struct slab_info **list, struct slab_stat *stats,
if (buffer[0] == '#') if (buffer[0] == '#')
continue; continue;
curr = get_slabnode(); curr = get_slabnode();
if (!curr) if (!curr)
break; break;

View File

@ -312,7 +312,7 @@ void eight_cpu_numbers(double *restrict uret, double *restrict nret, double *res
new_y = 0; new_y = 0;
tmp_z = 0.0; tmp_z = 0.0;
new_z = 0; new_z = 0;
FILE_TO_BUF(STAT_FILE,stat_fd); FILE_TO_BUF(STAT_FILE,stat_fd);
sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y, &new_z); sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y, &new_z);
ticks_past = (new_u+new_n+new_s+new_i+new_w+new_x+new_y+new_z)-(old_u+old_n+old_s+old_i+old_w+old_x+old_y+old_z); ticks_past = (new_u+new_n+new_s+new_i+new_w+new_x+new_y+new_z)-(old_u+old_n+old_s+old_i+old_w+old_x+old_y+old_z);
@ -360,7 +360,7 @@ void eight_cpu_numbers(double *restrict uret, double *restrict nret, double *res
void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) { void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
double avg_1=0, avg_5=0, avg_15=0; double avg_1=0, avg_5=0, avg_15=0;
char *savelocale; char *savelocale;
FILE_TO_BUF(LOADAVG_FILE,loadavg_fd); FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
savelocale = strdup(setlocale(LC_NUMERIC, NULL)); savelocale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");

View File

@ -45,7 +45,7 @@ void init_Linux_version(void) {
#ifdef __linux__ #ifdef __linux__
static struct utsname uts; static struct utsname uts;
if (uname(&uts) == -1) /* failure implies impending death */ if (uname(&uts) == -1) /* failure implies impending death */
exit(1); exit(1);
@ -66,7 +66,7 @@ void init_Linux_version(void) {
fclose(fp); fclose(fp);
version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z); version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z);
#endif /* __linux__ */ #endif /* __linux__ */
if ((version_string_depth < 2) || /* Non-standard for all known kernels */ if ((version_string_depth < 2) || /* Non-standard for all known kernels */
((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
#ifdef __linux__ #ifdef __linux__

View File

@ -90,7 +90,7 @@ static struct slab_info *slabsort(struct slab_info *list)
list = list->next; list = list->next;
b = b->next->next; b = b->next->next;
} }
b = list->next; b = list->next;
list->next = NULL; list->next = NULL;

View File

@ -113,7 +113,6 @@ int main(int argc, char **argv)
{"version", no_argument, NULL, 'V'}, {"version", no_argument, NULL, 'V'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
#ifdef HAVE_PROGRAM_INVOCATION_NAME #ifdef HAVE_PROGRAM_INVOCATION_NAME
program_invocation_name = program_invocation_short_name; program_invocation_name = program_invocation_short_name;
#endif #endif

4
w.c
View File

@ -142,12 +142,12 @@ static void print_display_or_interface(const char *restrict host, int len, int r
fputc('-', stdout); fputc('-', stdout);
} }
} else { /* multiple colons found - it's an IPv6 address */ } else { /* multiple colons found - it's an IPv6 address */
/* search for % (interface separator in case of IPv6 link address) */ /* search for % (interface separator in case of IPv6 link address) */
while ( (tmp < (host + len)) && (*tmp != '%') && isprint(*tmp) ) tmp++; while ( (tmp < (host + len)) && (*tmp != '%') && isprint(*tmp) ) tmp++;
if (*tmp == '%') { /* interface separator found */ if (*tmp == '%') { /* interface separator found */
/* number of chars till the end of the input field */ /* number of chars till the end of the input field */
len -= (tmp - host); len -= (tmp - host);