summaryrefslogtreecommitdiff
path: root/lib/sockopt.c
diff options
context:
space:
mode:
authorpaul <paul>2004-10-10 11:56:56 +0000
committerpaul <paul>2004-10-10 11:56:56 +0000
commit9035efaa924c69f4f4fcb1049c7dc4f43b9da980 (patch)
treef81d25b0e069ad8fb5f2843172a4e60fa0d6cbdf /lib/sockopt.c
parentddd119fd3d94e95dd44aa9fb3bc3fca4f26078a0 (diff)
2004-10-10 Paul Jakma <paul@dishone.st>
* version.h.in: (pid_output*) add const qualifier. * command.h: Change DEFUN func to take const char *[] rather than char **, to begin process of fixing compile warnings in lib/. Nearly all other changes in this commit follow from this change. * buffer.{c,h}: (buffer_write) pointer-arithmetic is gccism, take const void * and cast an automatic const char *p to it. (buffer_putstr) add const * command.c: (zencrypt) const qualifier (cmd_execute_command_real) ditto (cmd_execute_command_strict) ditto (config_log_file) ditto. Fix leak of getcwd() returned string. * memory.{c,h}: Add MTYPE_DISTRIBUTE_IFNAME for struct dist ifname. * distribute.{c,h}: Update with const qualifier. (distribute_free) use MTYPE_DISTRIBUTE_IFNAME (distribute_lookup) Cast to char *, note that it's ok. (distribute_hash_alloc) use MTYPE_DISTRIBUTE_IFNAME. (distribute_get) Cast to char *, note that it's ok. * filter.c: Update with const qualifier. * if.{c,h}: ditto. * if_rmap.{c,h}: ditto. (if_rmap_lookup) Cast to char *, note that it's ok. (if_rmap_get) ditto. * log.{c,h}: Update with const qualifier. * plist.{c,h}: ditto. * routemap.{c,h}: ditto. * smux.{c,h}: ditto. Fix some signed/unsigned comparisons. * sockopt.c: (getsockopt_cmsg_data) add return for error case. * vty.c: Update with const qualifier.
Diffstat (limited to 'lib/sockopt.c')
-rw-r--r--lib/sockopt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sockopt.c b/lib/sockopt.c
index 5936d661..c448d308 100644
--- a/lib/sockopt.c
+++ b/lib/sockopt.c
@@ -46,6 +46,8 @@ getsockopt_cmsg_data (struct msghdr *msgh, int level, int type)
cmsg = CMSG_NXTHDR(msgh, cmsg))
if (cmsg->cmsg_level == level && cmsg->cmsg_type)
return (ptr = CMSG_DATA(cmsg));
+
+ return NULL;
}
#ifdef HAVE_IPV6