# HG changeset patch # User martinb # Date 990769346 0 # Node ID 6db80f4ab17cb20f67425e06d416914ee89751d6 # Parent d5e8f5ad50431b6dcfd7eec80b2aafe706824cc1 [xemacs-hg @ 2001-05-25 05:42:25 by martinb] Cleaning up after error-frobbing patch: More compiler warnings/errors diff -r d5e8f5ad5043 -r 6db80f4ab17c src/ChangeLog --- a/src/ChangeLog Fri May 25 04:22:33 2001 +0000 +++ b/src/ChangeLog Fri May 25 05:42:26 2001 +0000 @@ -1,6 +1,15 @@ 2001-05-25 Martin Buchholz - * fns.c (base64_conversion_error): Fix compile warning. + * process-unix.c (unix_canonicalize_host_name): Fix compile warnings. + (unix_open_network_stream): Likewise. + * sound.h (sound_perror): Likewise. + (sound_warn): Likewise. + * emodules.c (emodules_load): Likewise. + * fns.c (base64_conversion_error): Likewise. + * tooltalk.c (check_status): Likewise. + * eldap.c (Fldap_open): Likewise. + * hpplay.c (player_error_internal): Likewise. + * win32.c (tstr_to_local_file_format): Likewise. * realpath.c: This file doesn't deal with internal representation. Define DONT_ENCAPSULATE. diff -r d5e8f5ad5043 -r 6db80f4ab17c src/device-msw.c --- a/src/device-msw.c Fri May 25 04:22:33 2001 +0000 +++ b/src/device-msw.c Fri May 25 05:42:26 2001 +0000 @@ -404,7 +404,7 @@ msprinter_default_printer (void) { Extbyte name[666]; - Bufbyte *nameint; + char *nameint; if (GetProfileString (XETEXT ("windows"), XETEXT ("device"), NULL, name, sizeof (name) / XETCHAR_SIZE) <= 0) diff -r d5e8f5ad5043 -r 6db80f4ab17c src/eldap.c --- a/src/eldap.c Fri May 25 04:22:33 2001 +0000 +++ b/src/eldap.c Fri May 25 05:42:26 2001 +0000 @@ -330,7 +330,7 @@ err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth); if (err != LDAP_SUCCESS) { - Bufbyte *interrmess; + char *interrmess; EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative); signal_error (Qprocess_error, "Failed binding to the server", build_string (interrmess)); diff -r d5e8f5ad5043 -r 6db80f4ab17c src/emodules.c --- a/src/emodules.c Fri May 25 04:22:33 2001 +0000 +++ b/src/emodules.c Fri May 25 05:42:26 2001 +0000 @@ -351,7 +351,7 @@ dlhandle = dll_open (soname); if (dlhandle == (dll_handle)0) { - Bufbyte *dllerrint; + char *dllerrint; EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative); signal_error (Qdll_error, "Opening dynamic module", diff -r d5e8f5ad5043 -r 6db80f4ab17c src/hpplay.c --- a/src/hpplay.c Fri May 25 04:22:33 2001 +0000 +++ b/src/hpplay.c Fri May 25 05:42:26 2001 +0000 @@ -75,7 +75,7 @@ player_error_internal (Audio * audio, Char_ASCII * text, long errorCode) { Extbyte errorbuff[132]; - Bufbyte *interr; + char *interr; AGetErrorText (audio, errorCode, errorbuff, 131); EXTERNAL_TO_C_STRING (errorbuf, interr, Qnative); diff -r d5e8f5ad5043 -r 6db80f4ab17c src/process-unix.c --- a/src/process-unix.c Fri May 25 04:22:33 2001 +0000 +++ b/src/process-unix.c Fri May 25 05:42:26 2001 +0000 @@ -1591,11 +1591,11 @@ retval = getaddrinfo (ext_host, NULL, &hints, &res); if (retval != 0) { - Bufbyte *gai_error; + char *gai_error; EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error, Qnative); maybe_signal_error (Qio_error, gai_error, host, - Qprocess, ERROR_ME_NOT); + Qprocess, ERROR_ME_NOT); canonname = host; } else @@ -1685,7 +1685,7 @@ retval = getaddrinfo (ext_host, portstring, &hints, &res); if (retval != 0) { - Bufbyte *gai_error; + char *gai_error; EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error, Qnative); signal_error (Qio_error, gai_error, list2 (host, service)); diff -r d5e8f5ad5043 -r 6db80f4ab17c src/sound.h --- a/src/sound.h Fri May 25 04:22:33 2001 +0000 +++ b/src/sound.h Fri May 25 05:42:26 2001 +0000 @@ -31,8 +31,8 @@ # define sound_perror(string) \ do { \ - Bufbyte *errmess; \ - Bufbyte *string_int; \ + char *errmess; \ + char *string_int; \ /* #### fix this to GET_STRERROR in my mule ws */ \ EXTERNAL_TO_C_STRING (strerror (errno), errmess, Qnative); \ EXTERNAL_TO_C_STRING (string, string_int, Qnative); \ @@ -40,7 +40,7 @@ } while (0) # define sound_warn(string) \ do { \ - Bufbyte *string_int; \ + char *string_int; \ EXTERNAL_TO_C_STRING (GETTEXT (string), string_int, Qnative); \ warn_when_safe (Qsound, Qwarning, "audio: %s", string_int); \ } while (0) diff -r d5e8f5ad5043 -r 6db80f4ab17c src/tooltalk.c --- a/src/tooltalk.c Fri May 25 04:22:33 2001 +0000 +++ b/src/tooltalk.c Fri May 25 05:42:26 2001 +0000 @@ -301,7 +301,7 @@ { if (tt_is_err (st)) { - Bufbyte *err; + char *err; EXTERNAL_TO_C_STRING (tt_status_message (st), err, Qnative); signal_error (Qtooltalk_error, err, Qunbound); diff -r d5e8f5ad5043 -r 6db80f4ab17c src/win32.c --- a/src/win32.c Fri May 25 04:22:33 2001 +0000 +++ b/src/win32.c Fri May 25 05:42:26 2001 +0000 @@ -84,7 +84,7 @@ Lisp_Object tstr_to_local_file_format (Extbyte *pathout) { - Bufbyte *ttlff; + char *ttlff; Lisp_Object in; EXTERNAL_TO_C_STRING (pathout, ttlff, Qmswindows_tstr);