Replace bzero() with memset().

Define AF_LOCAL and SUN_LEN for systems that lack them.
Don't mix function and non function pointers without casting.
Fix a potential type mismatch in assignment.

gtk/conf.c

@@ -94,7 +94,7 @@ lockfile(const char *file, char **errstr) {
     return -1;
   }
 
-  bzero(&lk, sizeof(lk));
+  memset(&lk, 0,  sizeof(lk));
   lk.l_start = 0;
   lk.l_len = 0;
   lk.l_type = F_WRLCK;
@@ -247,7 +247,7 @@ cf_loadprefs(char **errstr) {
   if(NULL == data)
     return;
 
-  bzero(&val, sizeof(val));
+  memset(&val, 0,  sizeof(val));
   if(!usedold && !tr_bencLoad(data, len, &val, NULL)) {
     if(TYPE_DICT == val.type) {
       key = NULL;
@@ -306,7 +306,7 @@ cf_loadstate(char **errstr) {
   state = g_new0(benc_val_t, 1);
   if(usedold || tr_bencLoad(data, len, state, NULL)) {
     /* XXX all this evil compat code should go away at some point */
-    bzero(state, sizeof(benc_val_t));
+    memset(state, 0,  sizeof(benc_val_t));
     state->type = TYPE_LIST;
     for(line = data; NULL != (eol = strchr(line, PREF_SEP_LINE));
         line = eol + 1) {
@@ -331,7 +331,7 @@ cf_benc_append(benc_val_t *val, char type, int incsize) {
   if(++val->val.l.count > val->val.l.alloc) {
     val->val.l.alloc += incsize;
     val->val.l.vals = g_renew(benc_val_t, val->val.l.vals, val->val.l.alloc);
-    bzero(val->val.l.vals + val->val.l.alloc - incsize,
+    memset(val->val.l.vals + val->val.l.alloc - incsize, 0,
           incsize * sizeof(benc_val_t));
   }
   val->val.l.vals[val->val.l.count-1].type = type;
@@ -409,7 +409,7 @@ cf_saveprefs(char **errstr) {
 
   *errstr = NULL;
 
-  bzero(&val, sizeof(val));
+  memset(&val, 0,  sizeof(val));
   val.type = TYPE_DICT;
   val.val.l.alloc = val.val.l.count = g_tree_nnodes(gl_prefs) * 2;
   val.val.l.vals = g_new0(benc_val_t, val.val.l.alloc);

gtk/io.c

@@ -165,9 +165,9 @@ newsource(void) {
   io->accepted = NULL;
   io->closed = NULL;
   io->cbdata = NULL;
-  bzero(&io->infd, sizeof(io->infd));
+  memset(&io->infd, 0,  sizeof(io->infd));
   io->infd.fd = -1;
-  bzero(&io->outfd, sizeof(io->outfd));
+  memset(&io->outfd, 0,  sizeof(io->outfd));
   io->outfd.fd = -1;
   io->inbuf = NULL;
   io->inused = 0;

gtk/ipc.c

@@ -46,6 +46,15 @@
 #include "tr_torrent.h"
 #include "util.h"
 
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_INET
+#endif
+
+#ifndef SUN_LEN
+#define SUN_LEN( sun )                                                       \
+  ( sizeof( *(sun) ) - sizeof( (sun)->sun_path ) + strlen( (sun)->sun_path ) )
+#endif
+
 /* XXX error handling throughout this file is pretty bogus */
 
 enum contype { CON_SERV, CON_CLIENT };
@@ -272,7 +281,7 @@ serv_bind(struct constate *con) {
   if(0 > (con->fd = socket(AF_LOCAL, SOCK_STREAM, 0)))
     goto fail;
 
-  bzero(&sa, sizeof(sa));
+  memset(&sa, 0,  sizeof(sa));
   sa.sun_family = AF_LOCAL;
   strncpy(sa.sun_path, gl_sockpath, sizeof(sa.sun_path) - 1);
 
@@ -323,7 +332,7 @@ client_connect(char *path, struct constate *con) {
     return FALSE;
   }
 
-  bzero(&addr, sizeof(addr));
+  memset(&addr, 0,  sizeof(addr));
   addr.sun_family = AF_UNIX;
   strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
 

gtk/main.c

@@ -1070,7 +1070,7 @@ static void
 safepipe(void) {
   struct sigaction sa;
 
-  bzero(&sa, sizeof(sa));
+  memset(&sa, 0,  sizeof(sa));
   sa.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &sa, NULL);
 }
@@ -1081,7 +1081,7 @@ setupsighandlers(void) {
   struct sigaction sa;
   int ii;
 
-  bzero(&sa, sizeof(sa));
+  memset(&sa, 0,  sizeof(sa));
   sa.sa_handler = fatalsig;
   for(ii = 0; ii < ALEN(sigs); ii++)
     sigaction(sigs[ii], &sa, NULL);
@@ -1092,7 +1092,7 @@ fatalsig(int sig) {
   struct sigaction sa;
 
   if(SIGCOUNT_MAX <= ++global_sigcount) {
-    bzero(&sa, sizeof(sa));
+    memset(&sa, 0,  sizeof(sa));
     sa.sa_handler = SIG_DFL;
     sigaction(sig, &sa, NULL);
     raise(sig);

gtk/torrent-inspector.c

@@ -152,7 +152,7 @@ refresh_pieces (GtkWidget * da, GdkEventExpose * event UNUSED, gpointer gtor)
 
   switch (mode) {
     case DRAW_AVAIL:
-      pieces = g_new (gint8, n_cells);
+      pieces = g_new (int8_t, n_cells);
       tr_torrentAvailability ( tor, pieces, n_cells );
       break;
     case DRAW_PROG:
@@ -1336,7 +1336,7 @@ file_page_new ( TrTorrent * gtor )
     g_signal_connect( view, "popup-menu",
                       G_CALLBACK(on_popup_menu), NULL );
     g_signal_connect( view, "button-press-event",
-                      G_CALLBACK(on_tree_view_button_pressed), on_popup_menu);
+                      G_CALLBACK(on_tree_view_button_pressed), (void*) on_popup_menu);
 
     /* add file column */
     

gtk/tr_window.c

@@ -223,7 +223,7 @@ makeview( PrivateData * p )
     g_signal_connect( view, "popup-menu",
                       G_CALLBACK(on_popup_menu), NULL );
     g_signal_connect( view, "button-press-event",
-                      G_CALLBACK(on_tree_view_button_pressed), on_popup_menu);
+                      G_CALLBACK(on_tree_view_button_pressed), (void *) on_popup_menu);
     g_signal_connect( view, "row-activated",
                       G_CALLBACK(view_row_activated), NULL);
 

gtk/util.c

@@ -415,7 +415,7 @@ verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
   if(NULL == func)
     funcdata = NULL;
   else
-    funcdata = g_list_append(g_list_append(NULL, func), data);
+      funcdata = g_list_append(g_list_append(NULL, (void *) func), data);
   g_signal_connect(dialog, "response", G_CALLBACK(errcb), funcdata);
   g_free(msg);
 
@@ -429,7 +429,7 @@ errcb(GtkWidget *widget, int resp SHUTUP, gpointer data) {
 
   if(NULL != data) {
     funcdata = g_list_first(data);
-    func = funcdata->data;
+    func = (callbackfunc_t) funcdata->data;
     data = funcdata->next->data;
     func(data);
     g_list_free(funcdata);