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>
This commit is contained in:
Donald Sharp 2016-06-04 19:12:18 -04:00
parent 6c4f4e6e6a
commit 69f30024c1
3 changed files with 3 additions and 3 deletions

View File

@ -899,7 +899,7 @@ route_match_probability (void *rule, struct prefix *prefix,
case 0: break; case 0: break;
case RAND_MAX: return RMAP_MATCH; case RAND_MAX: return RMAP_MATCH;
default: default:
if (r < *(unsigned long *) rule) if (r < *(long *) rule)
{ {
return RMAP_MATCH; return RMAP_MATCH;
} }

View File

@ -474,7 +474,7 @@ zlog_signal(int signo, const char *action
s = str_append (LOC, "\n"); 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 no file logging configured, try to write to fallback log file. */
if (logfile_fd >= 0) if (logfile_fd >= 0)
DUMP(logfile_fd) DUMP(logfile_fd)

View File

@ -813,7 +813,7 @@ generic_thread_add(struct thread_master *m, int (*func) (struct thread *),
/* is there enough space for a new fd? */ /* is there enough space for a new fd? */
assert (queuepos < m->handler.pfdsize); 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].fd = fd;
m->handler.pfds[queuepos].events |= event; m->handler.pfds[queuepos].events |= event;
if (queuepos == m->handler.pfdcount) if (queuepos == m->handler.pfdcount)