Mercurial > ~mikael > mcabber > hg
changeset 952:527d6f234924
Small code cleanup
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 26 Aug 2006 21:13:13 +0200 |
| parents | f243293e70ad |
| children | 1757f8b03b8f |
| files | mcabber/src/events.h mcabber/src/hbuf.h mcabber/src/jabglue.h mcabber/src/logprint.h mcabber/src/roster.c mcabber/src/roster.h mcabber/src/screen.c mcabber/src/utils.c mcabber/src/utils.h |
| diffstat | 9 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/src/events.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/events.h Sat Aug 26 21:13:13 2006 +0200 @@ -7,9 +7,9 @@ #define EVS_DEFAULT_TIMEOUT 90 #define EVS_MAX_TIMEOUT 432000 -#define EVS_CONTEXT_TIMEOUT 0 -#define EVS_CONTEXT_CANCEL 1 -#define EVS_CONTEXT_USER 2 +#define EVS_CONTEXT_TIMEOUT 0U +#define EVS_CONTEXT_CANCEL 1U +#define EVS_CONTEXT_USER 2U typedef enum { EVS_TYPE_SUBSCRIPTION = 1
--- a/mcabber/src/hbuf.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/hbuf.h Sat Aug 26 21:13:13 2006 +0200 @@ -14,16 +14,16 @@ #define HBB_FLAG_ALLOC 1 #define HBB_FLAG_PERSISTENT 2 -#define HBB_PREFIX_IN 1 -#define HBB_PREFIX_OUT 2 -#define HBB_PREFIX_STATUS 4 -#define HBB_PREFIX_AUTH 8 -#define HBB_PREFIX_INFO 16 -#define HBB_PREFIX_ERR 32 -#define HBB_PREFIX_NOFLAG 64 -#define HBB_PREFIX_HLIGHT 128 -#define HBB_PREFIX_NONE 256 -#define HBB_PREFIX_SPECIAL 512 +#define HBB_PREFIX_IN 1U +#define HBB_PREFIX_OUT 2U +#define HBB_PREFIX_STATUS 4U +#define HBB_PREFIX_AUTH 8U +#define HBB_PREFIX_INFO 16U +#define HBB_PREFIX_ERR 32U +#define HBB_PREFIX_NOFLAG 64U +#define HBB_PREFIX_HLIGHT 128U +#define HBB_PREFIX_NONE 256U +#define HBB_PREFIX_SPECIAL 512U typedef struct { time_t timestamp;
--- a/mcabber/src/jabglue.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/jabglue.h Sat Aug 26 21:13:13 2006 +0200 @@ -38,7 +38,7 @@ int ssl, const char *pass); inline unsigned char jb_getonline(void); void jb_disconnect(void); -void jb_main(); +void jb_main(void); void jb_subscr_send_auth(const char *jid); void jb_subscr_cancel_auth(const char *jid); void jb_subscr_request_auth(const char *jid); @@ -46,14 +46,14 @@ void jb_addbuddy(const char *jid, const char *name, const char *group); void jb_delbuddy(const char *jid); void jb_updatebuddy(const char *jid, const char *name, const char *group); -inline enum imstatus jb_getstatus(); -inline const char *jb_getstatusmsg(); +inline enum imstatus jb_getstatus(void); +inline const char *jb_getstatusmsg(void); void jb_setstatus(enum imstatus st, const char *recipient, const char *msg); void jb_send_msg(const char *jid, const char *text, int type, const char *subject); void jb_send_raw(const char *str); -void jb_keepalive(); -inline void jb_reset_keepalive(); +void jb_keepalive(void); +inline void jb_reset_keepalive(void); void jb_set_keepalive_delay(unsigned int delay); void jb_room_join(const char *room, const char *nickname, const char *passwd); void jb_room_unlock(const char *room);
--- a/mcabber/src/logprint.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/logprint.h Sat Aug 26 21:13:13 2006 +0200 @@ -2,10 +2,10 @@ #define __LOGPRINT_H__ 1 // Flags for scr_LogPrint() -#define LPRINT_NORMAL 1 // Display in log window -#define LPRINT_LOG 2 // Log to file (if enabled) -#define LPRINT_DEBUG 4 // Debug message (log if enabled) -#define LPRINT_NOTUTF8 8 // Do not convert from UTF-8 to locale +#define LPRINT_NORMAL 1U // Display in log window +#define LPRINT_LOG 2U // Log to file (if enabled) +#define LPRINT_DEBUG 4U // Debug message (log if enabled) +#define LPRINT_NOTUTF8 8U // Do not convert from UTF-8 to locale // For convenience... #define LPRINT_LOGNORM (LPRINT_NORMAL|LPRINT_LOG)
--- a/mcabber/src/roster.c Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/roster.c Sat Aug 26 21:13:13 2006 +0200 @@ -65,7 +65,7 @@ /* For groupchats */ gchar *nickname; gchar *topic; - guint8 inside_room; + guint inside_room; /* To keep track of last status message */ gchar *offline_status_message; @@ -939,7 +939,7 @@ // buddy_setinsideroom(buddy, inside) // Only for chatrooms -void buddy_setinsideroom(gpointer rosterdata, guint8 inside) +void buddy_setinsideroom(gpointer rosterdata, guint inside) { roster *roster_usr = rosterdata; @@ -948,7 +948,7 @@ roster_usr->inside_room = inside; } -guint8 buddy_getinsideroom(gpointer rosterdata) +guint buddy_getinsideroom(gpointer rosterdata) { roster *roster_usr = rosterdata; return roster_usr->inside_room;
--- a/mcabber/src/roster.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/roster.h Sat Aug 26 21:13:13 2006 +0200 @@ -115,8 +115,8 @@ const char *buddy_getname(gpointer rosterdata); void buddy_setnickname(gpointer rosterdata, const char *newname); const char *buddy_getnickname(gpointer rosterdata); -void buddy_setinsideroom(gpointer rosterdata, guint8 inside); -guint8 buddy_getinsideroom(gpointer rosterdata); +void buddy_setinsideroom(gpointer rosterdata, guint inside); +guint buddy_getinsideroom(gpointer rosterdata); void buddy_settopic(gpointer rosterdata, const char *newtopic); const char *buddy_gettopic(gpointer rosterdata); void buddy_settype(gpointer rosterdata, guint type);
--- a/mcabber/src/screen.c Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/screen.c Sat Aug 26 21:13:13 2006 +0200 @@ -2280,7 +2280,7 @@ // 0 if "seq" could match 1 or more known sequences // >0 if "seq" matches a key sequence; the mkey code is returned // and *ret is set to the matching keyseq structure. -static inline guint match_keyseq(int *iseq, keyseq **ret) +static inline gint match_keyseq(int *iseq, keyseq **ret) { GSList *ksl; keyseq *ksp;
--- a/mcabber/src/utils.c Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/utils.c Sat Aug 26 21:13:13 2006 +0200 @@ -44,7 +44,7 @@ static int DebugEnabled; static char *FName; -void ut_InitDebug(unsigned int level, const char *filename) +void ut_InitDebug(int level, const char *filename) { FILE *fp; struct stat buf;
--- a/mcabber/src/utils.h Mon Aug 21 21:28:58 2006 +0200 +++ b/mcabber/src/utils.h Sat Aug 26 21:13:13 2006 +0200 @@ -9,7 +9,7 @@ #define from_utf8(s) ((s) ? g_convert_with_fallback((s), -1, LocaleCharSet, \ "UTF-8", NULL,NULL,NULL,NULL) : NULL) -void ut_InitDebug(unsigned int level, const char *file); +void ut_InitDebug(int level, const char *file); void ut_WriteLog(unsigned int flag, const char *data); int checkset_perm(const char *name, unsigned int setmode);