lib, bgpd: Fixup some more compile errors due to warnings

Original cherry-pick done on a fedora box with a completely
different compiler.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index a7d62a6b37e0e31252cefa9173b33b05683a57b6..f237f7689b11e94a7deb41fcab052ab84629f7b9 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -899,7 +899,7 @@ route_match_probability (void *rule, struct prefix *prefix,
     case 0: break;
     case RAND_MAX: return RMAP_MATCH;
     default:
-      if (r < *(unsigned long *) rule)
+      if (r < *(long *) rule)
         {
           return RMAP_MATCH;
         }

diff --git a/lib/log.c b/lib/log.c
index 5354d32c0fc142e018f58ccafa188fbd8a6dcebf..453a611dcdc6ff577a5b86a8227b7ade1cd6aaf3 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -474,7 +474,7 @@ zlog_signal(int signo, const char *action
       s = str_append (LOC, "\n");
     }
 
-#define DUMP(FD) write(FD, buf, s-buf);
+#define DUMP(FD) write_wrapper(FD, buf, s-buf);
   /* If no file logging configured, try to write to fallback log file. */
   if (logfile_fd >= 0)
     DUMP(logfile_fd)

diff --git a/lib/thread.c b/lib/thread.c
index 21fb2b95630357ca9aa0eb2a7bb4c8ad688b3a12..2b1ca13dee973f438ae0ffd5acadfeaa0c898a97 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -813,7 +813,7 @@ generic_thread_add(struct thread_master *m, int (*func) (struct thread *),
   /* is there enough space for a new fd? */
   assert (queuepos < m->handler.pfdsize);
 
-  thread = thread_get (m, type, func, arg, funcname, debugargpass);
+  thread = thread_get (m, type, func, arg, debugargpass);
   m->handler.pfds[queuepos].fd = fd;
   m->handler.pfds[queuepos].events |= event;
   if (queuepos == m->handler.pfdcount)