From 00c9479c4c61a34aac8e9f13465f81a2fb5b2774 Mon Sep 17 00:00:00 2001
From: "Nicholas J. Kain" <nicholas@kain.us>
Date: Sat, 14 Feb 2015 01:46:02 -0500
Subject: [PATCH] Mark more pointer arguments as never being null.

---
 src/dhcp.c    | 2 +-
 src/options.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/dhcp.c b/src/dhcp.c
index 584a6e5..567d016 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -343,7 +343,7 @@ void stop_dhcp_listen(struct client_state_t cs[static 1])
 
 static int validate_dhcp_packet(struct client_state_t cs[static 1],
                                 size_t len, struct dhcpmsg packet[static 1],
-                                uint8_t *msgtype)
+                                uint8_t msgtype[static 1])
 {
     if (len < offsetof(struct dhcpmsg, options)) {
         log_warning("%s: Packet is too short to contain magic cookie.  Ignoring.",
diff --git a/src/options.c b/src/options.c
index 1fbeec3..e247531 100644
--- a/src/options.c
+++ b/src/options.c
@@ -75,8 +75,9 @@ static int overload_value(const struct dhcpmsg packet[static 1])
     return ol; // ol == 0
 }
 
-static void do_get_dhcp_opt(const uint8_t *sbuf, ssize_t slen, uint8_t code,
-                            uint8_t *dbuf, ssize_t dlen, ssize_t *didx)
+static void do_get_dhcp_opt(const uint8_t sbuf[static 1], ssize_t slen,
+                            uint8_t code, uint8_t dbuf[static 1],
+                            ssize_t dlen, ssize_t didx[static 1])
 {
     ssize_t i = 0;
     while (i < slen) {
@@ -102,7 +103,7 @@ static void do_get_dhcp_opt(const uint8_t *sbuf, ssize_t slen, uint8_t code,
 }
 
 ssize_t get_dhcp_opt(const struct dhcpmsg packet[static 1], uint8_t code,
-                     uint8_t *dbuf, ssize_t dlen)
+                     uint8_t dbuf[static 1], ssize_t dlen)
 {
     int ol = overload_value(packet);
     ssize_t didx = 0;