Mercurial > pidgin.yaz
changeset 10344:5976491e07a7
[gaim-migrate @ 11554]
Assorted silly compile warning fixes
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 11 Dec 2004 00:06:06 +0000 |
| parents | ee4f477fc8cf |
| children | 2e01c503aa4f |
| files | plugins/gaim-remote/remote.c plugins/tcl/tcl.c src/protocols/gg/libgg.c src/protocols/gg/libgg.h src/protocols/oscar/aim.h src/protocols/oscar/aim_internal.h |
| diffstat | 6 files changed, 18 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/gaim-remote/remote.c Fri Dec 10 05:49:01 2004 +0000 +++ b/plugins/gaim-remote/remote.c Sat Dec 11 00:06:06 2004 +0000 @@ -759,7 +759,7 @@ { #ifndef _WIN32 GIOChannel *channel; - char *buf; + char *buf = NULL; if ((UI_fd = open_socket(&buf)) < 0) { gaim_notify_error(NULL, NULL, _("Unable to open socket"), buf);
--- a/plugins/tcl/tcl.c Fri Dec 10 05:49:01 2004 +0000 +++ b/plugins/tcl/tcl.c Sat Dec 11 00:06:06 2004 +0000 @@ -158,6 +158,7 @@ struct stat st; FILE *fp; char *buf, *cur; + const char *next; int len, found = 0, err = 0, nelems; gboolean status = FALSE; @@ -170,11 +171,11 @@ len = st.st_size; buf = g_malloc(len + 1); - - cur = buf; + + cur = buf; while (fgets(cur, (int) buf - (buf - cur), fp)) { cur += strlen(cur); - if (feof(fp)) + if (feof(fp)) break; } @@ -191,9 +192,9 @@ return FALSE; } - cur = buf; + next = buf; do { - if (Tcl_ParseCommand(interp, cur, len, 0, &parse) == TCL_ERROR) { + if (Tcl_ParseCommand(interp, next, len, 0, &parse) == TCL_ERROR) { gaim_debug(GAIM_DEBUG_ERROR, "tcl", "parse error in %s: %s\n", plugin->path, Tcl_GetString(Tcl_GetObjResult(interp))); err = 1; @@ -210,8 +211,8 @@ /* We'll continue parsing the file, just in case */ } } - len -= (parse.commandStart + parse.commandSize) - cur; - cur = parse.commandStart + parse.commandSize; + len -= (parse.commandStart + parse.commandSize) - next; + next = parse.commandStart + parse.commandSize; Tcl_FreeParse(&parse); } while (len);
--- a/src/protocols/gg/libgg.c Fri Dec 10 05:49:01 2004 +0000 +++ b/src/protocols/gg/libgg.c Sat Dec 11 00:06:06 2004 +0000 @@ -1,4 +1,4 @@ -/* $Id: libgg.c 10742 2004-08-25 03:09:08Z thekingant $ */ +/* $Id: libgg.c 11554 2004-12-11 00:06:06Z thekingant $ */ /* * (C) Copyright 2001 Wojtek Kaniewski <wojtekka@irc.pl>, @@ -70,7 +70,7 @@ #ifdef __GNUC__ __attribute__ ((unused)) #endif -= "$Id: libgg.c 10742 2004-08-25 03:09:08Z thekingant $"; += "$Id: libgg.c 11554 2004-12-11 00:06:06Z thekingant $"; #endif @@ -658,7 +658,7 @@ * * numer sekwencyjny wiadomości lub -1 w przypadku błędu. */ -int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message) +int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const char *message) { gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message(%p, %d, %u, %p)\n", sess, msgclass, recipient, message); @@ -680,7 +680,7 @@ * * numer sekwencyjny wiadomości lub -1 w przypadku błędu. */ -int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, const unsigned char *format, int formatlen) +int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const char *message, const unsigned char *format, int formatlen) { struct gg_send_msg s;
--- a/src/protocols/gg/libgg.h Fri Dec 10 05:49:01 2004 +0000 +++ b/src/protocols/gg/libgg.h Sat Dec 11 00:06:06 2004 +0000 @@ -1,4 +1,4 @@ -/* $Id: libgg.h 10742 2004-08-25 03:09:08Z thekingant $ */ +/* $Id: libgg.h 11554 2004-12-11 00:06:06Z thekingant $ */ /* * (C) Copyright 2001 Wojtek Kaniewski <wojtekka@irc.pl>, @@ -163,8 +163,8 @@ int gg_write(struct gg_session *sess, const char *buf, int length); int gg_change_status(struct gg_session *sess, int status); int gg_change_status_descr(struct gg_session *sess, int status, const char *descr); -int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message); -int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, const unsigned char *format, int formatlen); +int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const char *message); +int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const char *message, const unsigned char *format, int formatlen); int gg_ping(struct gg_session *sess); int gg_userlist_request(struct gg_session *sess, char type, const char *request); @@ -272,7 +272,7 @@ uin_t sender; int msgclass; time_t time; - unsigned char *message; + char *message; } msg; struct gg_notify_reply *notify; struct { /* @notify60 informacja o liście kontaktów -- GG_EVENT_NOTIFY60 */
--- a/src/protocols/oscar/aim.h Fri Dec 10 05:49:01 2004 +0000 +++ b/src/protocols/oscar/aim.h Sat Dec 11 00:06:06 2004 +0000 @@ -502,7 +502,7 @@ faim_export int aim_logoff(aim_session_t *); -#if !defined(FAIM_INTERNAL) || defined(FAIM_INTERNAL_INSANE) +#if !defined(FAIM_INTERNAL) /* the library should never call aim_conn_kill */ faim_export void aim_conn_kill(aim_session_t *sess, aim_conn_t **deadconn); #endif
--- a/src/protocols/oscar/aim_internal.h Fri Dec 10 05:49:01 2004 +0000 +++ b/src/protocols/oscar/aim_internal.h Sat Dec 11 00:06:06 2004 +0000 @@ -214,10 +214,5 @@ faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...); -#ifndef FAIM_INTERNAL_INSANE -#define printf() printf called inside libfaim -#define sprintf() unbounded sprintf used inside libfaim -#endif - #endif /* __AIM_INTERNAL_H__ */ #endif /* FAIM_INTERNAL */