Mercurial > hg > xemacs-beta
annotate netinstall/concat.cc @ 5016:2ade80e8c640
enable more warnings and fix them
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
Various warnings that used to be present had mistakenly gotten
turned off. Turn them back on.
lwlib/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* xt-wrappers.h:
* xt-wrappers.h (Xt_SET_VALUE):
* xt-wrappers.h (Xt_GET_VALUE):
Rename var to avoid shadowing problems.
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* alloc.c:
Add prototypes for debugging functions.
* alloc.c (compact_string_chars): Make static.
* console-x.c (x_initially_selected_for_input):
* console-x.h:
* console-x.h (X_ERROR_OCCURRED):
Delete x_has_keysym() prototype from console-x.c, move to console-x.h.
* eval.c (multiple_value_call):
Real bug: Fix shadowing local vars.
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (signal_fake_event):
* lread.c (check_if_suppressed):
* strftime.c (strftime):
Fix stupid global shadowing warnings.
* event-unixoid.c (signal_fake_event):
* event-unixoid.c (drain_signal_event_pipe):
Use Rawbyte, not char.
* frame.h: Remove old prototype.
* gc.c:
* gc.c (show_gc_cursor_and_message):
* gc.c (remove_gc_cursor_and_message):
* gc.c (gc_prepare):
* gc.c (gc_finish_mark):
* gc.c (gc_finalize):
* gc.c (gc_sweep):
* gc.c (gc_finish):
* gc.c (gc_suspend_mark_phase):
* gc.c (gc_resume_mark_phase):
* gc.c (gc_mark):
* gc.c (gc_resume_mark):
Make fns static.
* glyphs-eimage.c (gif_decode_error_string):
Fix non-prototype.
* lisp.h:
Hack around global shadowing warnings involving `index'.
* intl-win32.c (wcsncpy):
* number-gmp.c (bigfloat_to_string):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* specifier.c (call_charset_predicate):
* specifier.c (DEFINE_SPECIFIER_TAG_FROB):
Declarations cannot follow statements in standard C.
* search.c (search_buffer): Fix local shadowing warnings.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 21:28:57 -0600 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* See concat.h. Note that we canonicalize the result, this avoids | |
| 17 multiple slashes being interpreted as UNCs. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 #include <stdarg.h> | |
| 21 #include <stdlib.h> | |
| 22 #include <string.h> | |
| 23 | |
| 24 char * CDECL | |
| 25 concat (char *s, ...) | |
| 26 { | |
| 27 int len; | |
| 28 char *rv, *arg; | |
| 29 va_list v; | |
| 30 | |
| 31 if (!s) | |
| 32 return 0; | |
| 33 | |
| 34 len = strlen (s); | |
| 35 | |
| 36 va_start (v, s); | |
| 37 while (1) | |
| 38 { | |
| 39 arg = va_arg (v, char *); | |
| 40 if (arg == 0) | |
| 41 break; | |
| 42 len += strlen (arg); | |
| 43 } | |
| 44 va_end (v); | |
| 45 | |
| 46 rv = (char *) malloc (len+1); | |
| 47 strcpy (rv, s); | |
| 48 va_start (v, s); | |
| 49 while (1) | |
| 50 { | |
| 51 arg = va_arg (v, char *); | |
| 52 if (arg == 0) | |
| 53 break; | |
| 54 strcat (rv, arg); | |
| 55 } | |
| 56 va_end (v); | |
| 57 | |
| 58 /* concat is only used for urls and files, so we can safely | |
| 59 canonicalize the results */ | |
| 60 char *d; | |
| 61 for (s=rv; *s; s++) | |
| 62 if (*s == '\\') | |
| 63 *s = '/'; | |
| 64 for (s=d=rv; *s; s++) | |
| 65 { | |
| 66 *d++ = *s; | |
| 67 /* special case for URLs */ | |
| 68 if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1) | |
| 69 { | |
| 70 *d++ = *++s; | |
| 71 *d++ = *++s; | |
| 72 } | |
| 73 else if (*s == '/') | |
| 74 while (s[1] == '/') | |
| 75 s++; | |
| 76 } | |
| 77 *d = 0; | |
| 78 | |
| 79 return rv; | |
| 80 } | |
| 81 | |
| 82 char * | |
| 83 backslash (char *s) | |
| 84 { | |
| 85 for (char *t = s; *t; t++) | |
| 86 if (*t == '/') | |
| 87 *t = '\\'; | |
| 88 return s; | |
| 89 } |