diff options
| author | Juanma Barranquero | 2003-02-04 14:56:31 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-02-04 14:56:31 +0000 |
| commit | 177c0ea74342272645959b82cf219faa0b3dba16 (patch) | |
| tree | 44e22b210a9904eab25a66d12e708804b671df75 /lib-src | |
| parent | db95369be096960245dd38678f68464627698678 (diff) | |
| download | emacs-177c0ea74342272645959b82cf219faa0b3dba16.tar.gz emacs-177c0ea74342272645959b82cf219faa0b3dba16.zip | |
Trailing whitespace deleted.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/b2m.pl | 6 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 6 | ||||
| -rw-r--r-- | lib-src/emacstool.c | 2 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 2 | ||||
| -rw-r--r-- | lib-src/makefile.nt | 14 | ||||
| -rw-r--r-- | lib-src/movemail.c | 10 | ||||
| -rw-r--r-- | lib-src/ntlib.c | 14 | ||||
| -rw-r--r-- | lib-src/pop.c | 6 | ||||
| -rw-r--r-- | lib-src/profile.c | 2 | ||||
| -rwxr-xr-x | lib-src/rcs-checkin | 2 | ||||
| -rw-r--r-- | lib-src/update-game-score.c | 28 | ||||
| -rw-r--r-- | lib-src/yow.c | 8 |
13 files changed, 52 insertions, 52 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 39266208b23..c983be1cce2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -3746,7 +3746,7 @@ Tue Jul 1 01:09:07 1997 Geoff Voelker <voelker@cs.washington.edu> | |||
| 3746 | * b2m.c: Use <...> to include config.h. | 3746 | * b2m.c: Use <...> to include config.h. |
| 3747 | Don't include stdlib.h. | 3747 | Don't include stdlib.h. |
| 3748 | 3748 | ||
| 3749 | 1994-03-03 Heiko Muenkel (muenkel@tnt.uni-hannover.de) | 3749 | 1994-03-03 Heiko Muenkel (muenkel@tnt.uni-hannover.de) |
| 3750 | 3750 | ||
| 3751 | * b2m.c (main): Change delimiter from "^L" to "^_^L". | 3751 | * b2m.c (main): Change delimiter from "^L" to "^_^L". |
| 3752 | Allow for text following "BABYL OPTIONS:". | 3752 | Allow for text following "BABYL OPTIONS:". |
| @@ -3963,7 +3963,7 @@ Tue Jul 1 01:09:07 1997 Geoff Voelker <voelker@cs.washington.edu> | |||
| 3963 | 3963 | ||
| 3964 | * Version 19.20 released. | 3964 | * Version 19.20 released. |
| 3965 | 3965 | ||
| 3966 | 1993-11-08 Tom Hageman (tom@basil.icce.rug.nl) | 3966 | 1993-11-08 Tom Hageman (tom@basil.icce.rug.nl) |
| 3967 | 3967 | ||
| 3968 | * etags.c: (C_entries): Keep track of ()-parenthesis level so that | 3968 | * etags.c: (C_entries): Keep track of ()-parenthesis level so that |
| 3969 | functions returning a pointer to a function, a la `signal', can be | 3969 | functions returning a pointer to a function, a la `signal', can be |
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl index 40738fd01ed..86f9b948b32 100644 --- a/lib-src/b2m.pl +++ b/lib-src/b2m.pl | |||
| @@ -30,7 +30,7 @@ use Mail::Address; | |||
| 30 | use Date::Parse; | 30 | use Date::Parse; |
| 31 | 31 | ||
| 32 | my($whoami) = basename $0; | 32 | my($whoami) = basename $0; |
| 33 | my($version) = '$Revision: 1.3 $'; | 33 | my($version) = '$Revision: 1.4 $'; |
| 34 | my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file] | 34 | my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file] |
| 35 | \tBy default, full headers are printed.\n"; | 35 | \tBy default, full headers are printed.\n"; |
| 36 | 36 | ||
| @@ -80,7 +80,7 @@ while (<>) { | |||
| 80 | $labels = $1; | 80 | $labels = $1; |
| 81 | 81 | ||
| 82 | # Strip the integer indicating whether the header is pruned | 82 | # Strip the integer indicating whether the header is pruned |
| 83 | $labels =~ s/^(\d+)[,\s]*//; | 83 | $labels =~ s/^(\d+)[,\s]*//; |
| 84 | $pruned = $1; | 84 | $pruned = $1; |
| 85 | 85 | ||
| 86 | s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted; | 86 | s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted; |
| @@ -113,7 +113,7 @@ while (<>) { | |||
| 113 | $labels =~ s/[,\s]+$//; | 113 | $labels =~ s/[,\s]+$//; |
| 114 | # Now collapse extra commas and whitespace in the remaining label string | 114 | # Now collapse extra commas and whitespace in the remaining label string |
| 115 | $labels =~ s/[,\s]+/, /g; | 115 | $labels =~ s/[,\s]+/, /g; |
| 116 | 116 | ||
| 117 | foreach my $rmail_header qw(summary-line x-coding-system) { | 117 | foreach my $rmail_header qw(summary-line x-coding-system) { |
| 118 | $full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i; | 118 | $full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i; |
| 119 | } | 119 | } |
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 87c6526c315..611c0f74c7d 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c | |||
| @@ -2511,7 +2511,7 @@ parm_list (flags) | |||
| 2511 | { | 2511 | { |
| 2512 | switch (LA1) | 2512 | switch (LA1) |
| 2513 | { | 2513 | { |
| 2514 | /* Skip over grouping parens or parameter lists in parameter | 2514 | /* Skip over grouping parens or parameter lists in parameter |
| 2515 | declarations. */ | 2515 | declarations. */ |
| 2516 | case '(': | 2516 | case '(': |
| 2517 | skip_matching (); | 2517 | skip_matching (); |
| @@ -3148,7 +3148,7 @@ class_definition (containing, tag, flags, nested) | |||
| 3148 | settings. */ | 3148 | settings. */ |
| 3149 | if ((tag != CLASS && !f_structs) || (nested && !f_nested_classes)) | 3149 | if ((tag != CLASS && !f_structs) || (nested && !f_nested_classes)) |
| 3150 | current = NULL; | 3150 | current = NULL; |
| 3151 | else | 3151 | else |
| 3152 | { | 3152 | { |
| 3153 | current = add_sym (yytext, containing); | 3153 | current = add_sym (yytext, containing); |
| 3154 | current->pos = BUFFER_POS (); | 3154 | current->pos = BUFFER_POS (); |
| @@ -3167,7 +3167,7 @@ class_definition (containing, tag, flags, nested) | |||
| 3167 | { | 3167 | { |
| 3168 | switch (LA1) | 3168 | switch (LA1) |
| 3169 | { | 3169 | { |
| 3170 | case VIRTUAL: case PUBLIC: case PROTECTED: case PRIVATE: | 3170 | case VIRTUAL: case PUBLIC: case PROTECTED: case PRIVATE: |
| 3171 | MATCH (); | 3171 | MATCH (); |
| 3172 | break; | 3172 | break; |
| 3173 | 3173 | ||
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c index 191deb95471..dcbc20feeed 100644 --- a/lib-src/emacstool.c +++ b/lib-src/emacstool.c | |||
| @@ -189,7 +189,7 @@ time_delta (now_sec, now_usec, prev_sec, prev_usec) | |||
| 189 | /* | 189 | /* |
| 190 | * Filter function to translate selected input events for emacs | 190 | * Filter function to translate selected input events for emacs |
| 191 | * Mouse button events become ^X^@(button x-col y-line time-delta) . | 191 | * Mouse button events become ^X^@(button x-col y-line time-delta) . |
| 192 | * Function keys: ESC-*{c}{lrt} l,r,t for Left, Right, Top; | 192 | * Function keys: ESC-*{c}{lrt} l,r,t for Left, Right, Top; |
| 193 | * {c} encodes the keynumber as a character [a-o] | 193 | * {c} encodes the keynumber as a character [a-o] |
| 194 | */ | 194 | */ |
| 195 | static Notify_value | 195 | static Notify_value |
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 0b90eba8953..ed6dde3a0bf 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -299,7 +299,7 @@ scan_keyword_or_put_char (ch, state) | |||
| 299 | while (ch != ' ' && ch != ')'); | 299 | while (ch != ' ' && ch != ')'); |
| 300 | put_char ('f', state); | 300 | put_char ('f', state); |
| 301 | put_char ('n', state); | 301 | put_char ('n', state); |
| 302 | 302 | ||
| 303 | /* Put back the last character. */ | 303 | /* Put back the last character. */ |
| 304 | ungetc (ch, state->in_file); | 304 | ungetc (ch, state->in_file); |
| 305 | } | 305 | } |
diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt index eef221ab0c3..d9553216337 100644 --- a/lib-src/makefile.nt +++ b/lib-src/makefile.nt | |||
| @@ -3,24 +3,24 @@ | |||
| 3 | # Copyright (C) 1994 Free Software Foundation, Inc. | 3 | # Copyright (C) 1994 Free Software Foundation, Inc. |
| 4 | # | 4 | # |
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | # | 6 | # |
| 7 | # GNU Emacs is free software; you can redistribute it and/or modify | 7 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | # it under the terms of the GNU General Public License as published by | 8 | # it under the terms of the GNU General Public License as published by |
| 9 | # the Free Software Foundation; either version 2, or (at your option) | 9 | # the Free Software Foundation; either version 2, or (at your option) |
| 10 | # any later version. | 10 | # any later version. |
| 11 | # | 11 | # |
| 12 | # GNU Emacs is distributed in the hope that it will be useful, | 12 | # GNU Emacs is distributed in the hope that it will be useful, |
| 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | # GNU General Public License for more details. | 15 | # GNU General Public License for more details. |
| 16 | # | 16 | # |
| 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
| 18 | # along with GNU Emacs; see the file COPYING. If not, write to the | 18 | # along with GNU Emacs; see the file COPYING. If not, write to the |
| 19 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 20 | # Boston, MA 02111-1307, USA. | 20 | # Boston, MA 02111-1307, USA. |
| 21 | # | 21 | # |
| 22 | 22 | ||
| 23 | # | 23 | # |
| 24 | # Sets up the system dependent macros. | 24 | # Sets up the system dependent macros. |
| 25 | # | 25 | # |
| 26 | !include ..\nt\makefile.def | 26 | !include ..\nt\makefile.def |
| @@ -139,7 +139,7 @@ $(BLD)\ebrowse.obj: ebrowse.c ..\src\config.h | |||
| 139 | # | 139 | # |
| 140 | # From ..\src\makefile.nt. | 140 | # From ..\src\makefile.nt. |
| 141 | # | 141 | # |
| 142 | obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c | 142 | obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c |
| 143 | 143 | ||
| 144 | # | 144 | # |
| 145 | # These are the lisp files that are loaded up in loadup.el | 145 | # These are the lisp files that are loaded up in loadup.el |
| @@ -224,7 +224,7 @@ lisp= \ | |||
| 224 | $(lispsource)version.el | 224 | $(lispsource)version.el |
| 225 | 225 | ||
| 226 | 226 | ||
| 227 | DOC = DOC | 227 | DOC = DOC |
| 228 | $(DOC): $(BLD)\make-docfile.exe | 228 | $(DOC): $(BLD)\make-docfile.exe |
| 229 | - $(DEL) $(DOC) | 229 | - $(DEL) $(DOC) |
| 230 | $(BLD)\make-docfile -d ..\src $(obj) > $(DOC) | 230 | $(BLD)\make-docfile -d ..\src $(obj) > $(DOC) |
| @@ -261,7 +261,7 @@ install: $(INSTALL_FILES) | |||
| 261 | 261 | ||
| 262 | # | 262 | # |
| 263 | # Maintenance | 263 | # Maintenance |
| 264 | # | 264 | # |
| 265 | clean:; - $(DEL) *~ *.pdb DOC* | 265 | clean:; - $(DEL) *~ *.pdb DOC* |
| 266 | - $(DEL) *.orig *.rej *.crlf ctags.c | 266 | - $(DEL) *.orig *.rej *.crlf ctags.c |
| 267 | - $(DEL_TREE) deleted | 267 | - $(DEL_TREE) deleted |
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 706a630c4bc..406dd8775bc 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -39,11 +39,11 @@ Boston, MA 02111-1307, USA. */ | |||
| 39 | * "po:username". This will cause movemail to open a connection to | 39 | * "po:username". This will cause movemail to open a connection to |
| 40 | * a pop server running on $MAILHOST (environment variable). Movemail | 40 | * a pop server running on $MAILHOST (environment variable). Movemail |
| 41 | * must be setuid to root in order to work with POP. | 41 | * must be setuid to root in order to work with POP. |
| 42 | * | 42 | * |
| 43 | * New module: popmail.c | 43 | * New module: popmail.c |
| 44 | * Modified routines: | 44 | * Modified routines: |
| 45 | * main - added code within #ifdef MAIL_USE_POP; added setuid (getuid ()) | 45 | * main - added code within #ifdef MAIL_USE_POP; added setuid (getuid ()) |
| 46 | * after POP code. | 46 | * after POP code. |
| 47 | * New routines in movemail.c: | 47 | * New routines in movemail.c: |
| 48 | * get_errmsg - return pointer to system error message | 48 | * get_errmsg - return pointer to system error message |
| 49 | * | 49 | * |
| @@ -458,7 +458,7 @@ main (argc, argv) | |||
| 458 | 458 | ||
| 459 | pfatal_with_name (inname); | 459 | pfatal_with_name (inname); |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | { | 462 | { |
| 463 | char buf[1024]; | 463 | char buf[1024]; |
| 464 | 464 | ||
| @@ -838,7 +838,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) | |||
| 838 | error ("Error from POP server: %s", pop_error, 0); | 838 | error ("Error from POP server: %s", pop_error, 0); |
| 839 | return (1); | 839 | return (1); |
| 840 | } | 840 | } |
| 841 | 841 | ||
| 842 | return (0); | 842 | return (0); |
| 843 | } | 843 | } |
| 844 | 844 | ||
| @@ -913,7 +913,7 @@ mbx_write (line, len, mbf) | |||
| 913 | line++; | 913 | line++; |
| 914 | len--; | 914 | len--; |
| 915 | } | 915 | } |
| 916 | if (fwrite (line, 1, len, mbf) != len) | 916 | if (fwrite (line, 1, len, mbf) != len) |
| 917 | return (NOTOK); | 917 | return (NOTOK); |
| 918 | if (fputc (0x0a, mbf) == EOF) | 918 | if (fputc (0x0a, mbf) == EOF) |
| 919 | return (NOTOK); | 919 | return (NOTOK); |
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 3e2caf50865..31bf758197d 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c | |||
| @@ -59,20 +59,20 @@ getppid(void) | |||
| 59 | DWORD result; | 59 | DWORD result; |
| 60 | 60 | ||
| 61 | ppid = getenv ("EM_PARENT_PROCESS_ID"); | 61 | ppid = getenv ("EM_PARENT_PROCESS_ID"); |
| 62 | if (!ppid) | 62 | if (!ppid) |
| 63 | { | 63 | { |
| 64 | printf("no pid.\n"); | 64 | printf("no pid.\n"); |
| 65 | return 0; | 65 | return 0; |
| 66 | } | 66 | } |
| 67 | else | 67 | else |
| 68 | { | 68 | { |
| 69 | getppid_ppid = atoi (ppid); | 69 | getppid_ppid = atoi (ppid); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | if (!getppid_parent) | 72 | if (!getppid_parent) |
| 73 | { | 73 | { |
| 74 | getppid_parent = OpenProcess (SYNCHRONIZE, FALSE, atoi(ppid)); | 74 | getppid_parent = OpenProcess (SYNCHRONIZE, FALSE, atoi(ppid)); |
| 75 | if (!getppid_parent) | 75 | if (!getppid_parent) |
| 76 | { | 76 | { |
| 77 | printf ("Failed to open handle to parent process: %d\n", | 77 | printf ("Failed to open handle to parent process: %d\n", |
| 78 | GetLastError()); | 78 | GetLastError()); |
| @@ -81,7 +81,7 @@ getppid(void) | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | result = WaitForSingleObject (getppid_parent, 0); | 83 | result = WaitForSingleObject (getppid_parent, 0); |
| 84 | switch (result) | 84 | switch (result) |
| 85 | { | 85 | { |
| 86 | case WAIT_TIMEOUT: | 86 | case WAIT_TIMEOUT: |
| 87 | /* The parent is still alive. */ | 87 | /* The parent is still alive. */ |
| @@ -188,7 +188,7 @@ fchown (int fd, int uid, int gid) | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | /* Place a wrapper around the MSVC version of ctime. It returns NULL | 190 | /* Place a wrapper around the MSVC version of ctime. It returns NULL |
| 191 | on network directories, so we handle that case here. | 191 | on network directories, so we handle that case here. |
| 192 | (Ulrich Leodolter, 1/11/95). */ | 192 | (Ulrich Leodolter, 1/11/95). */ |
| 193 | char * | 193 | char * |
| 194 | sys_ctime (const time_t *t) | 194 | sys_ctime (const time_t *t) |
diff --git a/lib-src/pop.c b/lib-src/pop.c index 46a60195aff..b51e82c82bf 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c | |||
| @@ -261,7 +261,7 @@ pop_open (host, username, password, flags) | |||
| 261 | #else | 261 | #else |
| 262 | #define DONT_NEED_PASSWORD 0 | 262 | #define DONT_NEED_PASSWORD 0 |
| 263 | #endif | 263 | #endif |
| 264 | 264 | ||
| 265 | if ((! password) && (! DONT_NEED_PASSWORD)) | 265 | if ((! password) && (! DONT_NEED_PASSWORD)) |
| 266 | { | 266 | { |
| 267 | if (! (flags & POP_NO_GETPASS)) | 267 | if (! (flags & POP_NO_GETPASS)) |
| @@ -560,7 +560,7 @@ pop_list (server, message, IDs, sizes) | |||
| 560 | * of lines with '>'. | 560 | * of lines with '>'. |
| 561 | * msg_buf Output parameter to which a buffer containing the | 561 | * msg_buf Output parameter to which a buffer containing the |
| 562 | * message is assigned. | 562 | * message is assigned. |
| 563 | * | 563 | * |
| 564 | * Return value: The number of bytes in msg_buf, which may contain | 564 | * Return value: The number of bytes in msg_buf, which may contain |
| 565 | * embedded nulls, not including its final null, or -1 on error | 565 | * embedded nulls, not including its final null, or -1 on error |
| 566 | * with pop_error set. | 566 | * with pop_error set. |
| @@ -643,7 +643,7 @@ pop_retrieve (server, message, markfrom, msg_buf) | |||
| 643 | 643 | ||
| 644 | free (ptr); | 644 | free (ptr); |
| 645 | return (-1); | 645 | return (-1); |
| 646 | } | 646 | } |
| 647 | 647 | ||
| 648 | int | 648 | int |
| 649 | pop_retrieve_first (server, message, response) | 649 | pop_retrieve_first (server, message, response) |
diff --git a/lib-src/profile.c b/lib-src/profile.c index e2fa4793b63..9c43c16e776 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c | |||
| @@ -48,7 +48,7 @@ reset_watch () | |||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | /* This call returns the time since the last reset_watch call. The time | 50 | /* This call returns the time since the last reset_watch call. The time |
| 51 | is returned as a string with the format <seconds>.<micro-seconds> | 51 | is returned as a string with the format <seconds>.<micro-seconds> |
| 52 | If reset_watch was not called yet, exit. */ | 52 | If reset_watch was not called yet, exit. */ |
| 53 | 53 | ||
| 54 | char * | 54 | char * |
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin index 184ed8ac01a..75616c3564e 100755 --- a/lib-src/rcs-checkin +++ b/lib-src/rcs-checkin | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | # is not deleted, as under VC with vc-keep-workfiles at its default of t, but | 31 | # is not deleted, as under VC with vc-keep-workfiles at its default of t, but |
| 32 | # all the version files are. | 32 | # all the version files are. |
| 33 | # | 33 | # |
| 34 | # If an argument file is already version-controlled under RCS, any version | 34 | # If an argument file is already version-controlled under RCS, any version |
| 35 | # files are added to the list of deltas and deleted, and then the workfile | 35 | # files are added to the list of deltas and deleted, and then the workfile |
| 36 | # is checked in again as the latest version. This is probably not quite | 36 | # is checked in again as the latest version. This is probably not quite |
| 37 | # what was wanted, and is the main reason VC doesn't simply call this to | 37 | # what was wanted, and is the main reason VC doesn't simply call this to |
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index d871e336802..55737c542d7 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c | |||
| @@ -216,13 +216,13 @@ main (argc, argv) | |||
| 216 | user_id = get_user_id (); | 216 | user_id = get_user_id (); |
| 217 | if (user_id == NULL) | 217 | if (user_id == NULL) |
| 218 | lose_syserr ("Couldn't determine user id"); | 218 | lose_syserr ("Couldn't determine user id"); |
| 219 | 219 | ||
| 220 | if (stat (scorefile, &buf) < 0) | 220 | if (stat (scorefile, &buf) < 0) |
| 221 | lose_syserr ("Failed to access scores file"); | 221 | lose_syserr ("Failed to access scores file"); |
| 222 | 222 | ||
| 223 | if (lock_file (scorefile, &lockstate) < 0) | 223 | if (lock_file (scorefile, &lockstate) < 0) |
| 224 | lose_syserr ("Failed to lock scores file"); | 224 | lose_syserr ("Failed to lock scores file"); |
| 225 | 225 | ||
| 226 | if (read_scores (scorefile, &scores, &scorecount) < 0) | 226 | if (read_scores (scorefile, &scores, &scorecount) < 0) |
| 227 | { | 227 | { |
| 228 | unlock_file (scorefile, lockstate); | 228 | unlock_file (scorefile, lockstate); |
| @@ -283,7 +283,7 @@ read_score (f, score) | |||
| 283 | char *username = malloc (unamelen); | 283 | char *username = malloc (unamelen); |
| 284 | if (!username) | 284 | if (!username) |
| 285 | return -1; | 285 | return -1; |
| 286 | 286 | ||
| 287 | while ((c = getc (f)) != EOF | 287 | while ((c = getc (f)) != EOF |
| 288 | && !isspace (c)) | 288 | && !isspace (c)) |
| 289 | { | 289 | { |
| @@ -293,7 +293,7 @@ read_score (f, score) | |||
| 293 | username[unameread] = c; | 293 | username[unameread] = c; |
| 294 | unameread++; | 294 | unameread++; |
| 295 | } | 295 | } |
| 296 | if (c == EOF) | 296 | if (c == EOF) |
| 297 | return -1; | 297 | return -1; |
| 298 | username[unameread] = '\0'; | 298 | username[unameread] = '\0'; |
| 299 | score->username = username; | 299 | score->username = username; |
| @@ -342,12 +342,12 @@ read_scores (filename, scores, count) | |||
| 342 | int readval, scorecount, cursize; | 342 | int readval, scorecount, cursize; |
| 343 | struct score_entry *ret; | 343 | struct score_entry *ret; |
| 344 | FILE *f = fopen (filename, "r"); | 344 | FILE *f = fopen (filename, "r"); |
| 345 | if (!f) | 345 | if (!f) |
| 346 | return -1; | 346 | return -1; |
| 347 | scorecount = 0; | 347 | scorecount = 0; |
| 348 | cursize = 16; | 348 | cursize = 16; |
| 349 | ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize); | 349 | ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize); |
| 350 | if (!ret) | 350 | if (!ret) |
| 351 | return -1; | 351 | return -1; |
| 352 | while ((readval = read_score (f, &ret[scorecount])) == 0) | 352 | while ((readval = read_score (f, &ret[scorecount])) == 0) |
| 353 | { | 353 | { |
| @@ -388,7 +388,7 @@ score_compare_reverse (a, b) | |||
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | int | 390 | int |
| 391 | push_score (scores, count, newscore, username, newdata) | 391 | push_score (scores, count, newscore, username, newdata) |
| 392 | struct score_entry **scores; | 392 | struct score_entry **scores; |
| 393 | int *count; int newscore; | 393 | int *count; int newscore; |
| 394 | char *username; | 394 | char *username; |
| @@ -406,12 +406,12 @@ push_score (scores, count, newscore, username, newdata) | |||
| 406 | *scores = newscores; | 406 | *scores = newscores; |
| 407 | return 0; | 407 | return 0; |
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | void | 410 | void |
| 411 | sort_scores (scores, count, reverse) | 411 | sort_scores (scores, count, reverse) |
| 412 | struct score_entry *scores; | 412 | struct score_entry *scores; |
| 413 | int count; | 413 | int count; |
| 414 | int reverse; | 414 | int reverse; |
| 415 | { | 415 | { |
| 416 | qsort (scores, count, sizeof (struct score_entry), | 416 | qsort (scores, count, sizeof (struct score_entry), |
| 417 | reverse ? score_compare_reverse : score_compare); | 417 | reverse ? score_compare_reverse : score_compare); |
| @@ -421,9 +421,9 @@ int | |||
| 421 | write_scores (filename, scores, count) | 421 | write_scores (filename, scores, count) |
| 422 | const char *filename; | 422 | const char *filename; |
| 423 | const struct score_entry * scores; | 423 | const struct score_entry * scores; |
| 424 | int count; | 424 | int count; |
| 425 | { | 425 | { |
| 426 | FILE *f; | 426 | FILE *f; |
| 427 | int i; | 427 | int i; |
| 428 | char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1); | 428 | char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1); |
| 429 | if (!tempfile) | 429 | if (!tempfile) |
| @@ -448,7 +448,7 @@ write_scores (filename, scores, count) | |||
| 448 | return -1; | 448 | return -1; |
| 449 | return 0; | 449 | return 0; |
| 450 | } | 450 | } |
| 451 | 451 | ||
| 452 | int | 452 | int |
| 453 | lock_file (filename, state) | 453 | lock_file (filename, state) |
| 454 | const char *filename; | 454 | const char *filename; |
| @@ -491,7 +491,7 @@ lock_file (filename, state) | |||
| 491 | close (fd); | 491 | close (fd); |
| 492 | return 0; | 492 | return 0; |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | int | 495 | int |
| 496 | unlock_file (filename, state) | 496 | unlock_file (filename, state) |
| 497 | const char *filename; | 497 | const char *filename; |
diff --git a/lib-src/yow.c b/lib-src/yow.c index 92df285870a..fa638b06466 100644 --- a/lib-src/yow.c +++ b/lib-src/yow.c | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * yow.c | 2 | * yow.c |
| 3 | * | 3 | * |
| 4 | * Print a quotation from Zippy the Pinhead. | 4 | * Print a quotation from Zippy the Pinhead. |
| 5 | * Qux <Kaufman-David@Yale> March 6, 1986 | 5 | * Qux <Kaufman-David@Yale> March 6, 1986 |
| 6 | * | 6 | * |
| 7 | * This file is in the public domain because the author published it | 7 | * This file is in the public domain because the author published it |
| 8 | * with no copyright notice before the US signed the Bern Convention. | 8 | * with no copyright notice before the US signed the Bern Convention. |
| 9 | * | 9 | * |
| 10 | * With dynamic memory allocation. | 10 | * With dynamic memory allocation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| @@ -114,7 +114,7 @@ setup_yow(fp) | |||
| 114 | header_len = ftell(fp); | 114 | header_len = ftell(fp); |
| 115 | if (header_len > AVG_LEN) | 115 | if (header_len > AVG_LEN) |
| 116 | header_len -= AVG_LEN; /* allow the first quotation to appear */ | 116 | header_len -= AVG_LEN; /* allow the first quotation to appear */ |
| 117 | 117 | ||
| 118 | if (fseek(fp, 0L, 2) == -1) { | 118 | if (fseek(fp, 0L, 2) == -1) { |
| 119 | perror("yow"); | 119 | perror("yow"); |
| 120 | exit(1); | 120 | exit(1); |
| @@ -167,7 +167,7 @@ yow (fp) | |||
| 167 | buf[i++] = c; | 167 | buf[i++] = c; |
| 168 | while ((c = getc(fp)) != SEP && c != EOF) { | 168 | while ((c = getc(fp)) != SEP && c != EOF) { |
| 169 | buf[i++] = c; | 169 | buf[i++] = c; |
| 170 | 170 | ||
| 171 | if (i == bufsize-1) { | 171 | if (i == bufsize-1) { |
| 172 | /* Yow! Is this quotation too long yet? */ | 172 | /* Yow! Is this quotation too long yet? */ |
| 173 | bufsize *= 2; | 173 | bufsize *= 2; |