De-register, compiler knows best

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

7 files changed, 29 insertions, 34 deletions

diff --git a/src/libnet_asn1.c b/src/libnet_asn1.c
index ff2fa16..8f17bed 100644
--- a/src/libnet_asn1.c
+++ b/src/libnet_asn1.c
@@ -64,8 +64,8 @@ libnet_build_asn1_int(uint8_t *data, int *datalen, uint8_t type, int32_t *int_p,
     /*
      *  ASN.1 integer ::= 0x02 asnlength byte {byte}*
      */
-     register int32_t integer;
-     register uint32_t mask;
+     int32_t integer;
+     uint32_t mask;
 
     if (int_s != sizeof (int32_t))
     {
@@ -115,8 +115,8 @@ libnet_build_asn1_uint(uint8_t *data, int *datalen, uint8_t type, uint32_t *int_
     /*
      *  ASN.1 integer ::= 0x02 asnlength byte {byte}*
      */
-    register uint32_t integer;
-    register uint32_t mask;
+    uint32_t integer;
+    uint32_t mask;
     int add_null_byte = 0;
 
     if (int_s != sizeof (int32_t))
@@ -283,11 +283,11 @@ libnet_build_asn1_objid(uint8_t *data, int *datalen, uint8_t type, oid *objid,
      *  lastbyte ::= 0 7bitvalue
      */
     int asnlen;
-    register oid *op = objid;
+    oid *op = objid;
     uint8_t objid_size[MAX_OID_LEN];
-    register uint32_t objid_val;
+    uint32_t objid_val;
     uint32_t first_objid_val;
-    register int i;
+    int i;
 
     /* check if there are at least 2 sub-identifiers */
     if (objidlen < 2)
diff --git a/src/libnet_if_addr.c b/src/libnet_if_addr.c
index fb66c09..241904d 100644
--- a/src/libnet_if_addr.c
+++ b/src/libnet_if_addr.c
@@ -99,7 +99,7 @@ libnet_check_iface(libnet_t *l)
 #include <ifaddrs.h>
 
 int
-libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev, register char *errbuf)
+libnet_ifaddrlist(struct libnet_ifaddr_list **ipaddrp, char *dev, char *errbuf)
 {
     static struct libnet_ifaddr_list *ifaddrlist = NULL;
     struct ifaddrs *ifap, *ifa;
@@ -186,7 +186,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev, regis
 #endif
 
 int
-libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev, register char *errbuf)
+libnet_ifaddrlist(struct libnet_ifaddr_list **ipaddrp, char *dev, char *errbuf)
 {
     static struct libnet_ifaddr_list *ifaddrlist = NULL;
     struct ifreq *ifr, *lifr, *pifr, nifr;
@@ -195,7 +195,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev, regis
     char *p;
     struct ifconf ifc;
     struct ifreq ibuf[MAX_IPADDR];
-    register int fd, nipaddr;
+    int fd, nipaddr;
     
 #ifdef HAVE_LINUX_PROCFS
     FILE *fp;
@@ -385,7 +385,7 @@ static int8_t *iptos(uint32_t in)
 }
 
 int
-libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev_unused, register char *errbuf)
+libnet_ifaddrlist(struct libnet_ifaddr_list **ipaddrp, char *dev_unused, char *errbuf)
 {
     static struct libnet_ifaddr_list *ifaddrlist = NULL;
     int8_t err[PCAP_ERRBUF_SIZE];
diff --git a/src/libnet_link_dlpi.c b/src/libnet_link_dlpi.c
index f16e3e3..07202c0 100644
--- a/src/libnet_link_dlpi.c
+++ b/src/libnet_link_dlpi.c
@@ -202,10 +202,10 @@ try_open_dev(libnet_t *l, const char *dev, int unit)
 int
 libnet_open_link(libnet_t *l)
 {
-    register int8_t *cp;
+    int8_t *cp;
     int8_t *eos;
     int ppa;
-    register dl_info_ack_t *infop;
+    dl_info_ack_t *infop;
     bpf_u_int32 buf[MAXDLBUF];
     int namelen;
     int8_t dname[MAXPATHLEN];
@@ -349,8 +349,7 @@ bad:
 
 
 static int
-send_request(int fd, int8_t *ptr, int len, int8_t *what, int8_t *ebuf,
-int flags)
+send_request(int fd, int8_t *ptr, int len, int8_t *what, int8_t *ebuf, int flags)
 {
     struct strbuf ctl;
 
@@ -538,13 +537,12 @@ strioctl(int fd, int cmd, int len, int8_t *dp)
  * Under HP-UX 10, we can ask for the ppa
  */
 static int
-get_dlpi_ppa(register int fd, register const int8_t *device, register int unit,
-register int8_t *ebuf)
+get_dlpi_ppa(int fd, const int8_t *device, int unit, int8_t *ebuf)
 {
-    register dl_hp_ppa_ack_t *ap;
-    register dl_hp_ppa_info_t *ip;
-    register int i;
-    register uint32_t majdev;
+    dl_hp_ppa_ack_t *ap;
+    dl_hp_ppa_info_t *ip;
+    int i;
+    uint32_t majdev;
     dl_hp_ppa_req_t	req;
     struct stat statbuf;
     bpf_u_int32 buf[MAXDLBUF];
@@ -613,11 +611,10 @@ static int8_t path_vmunix[] = "/hp-ux";
  *  Determine ppa number that specifies ifname
  */
 static int
-get_dlpi_ppa(register int fd, register const int8_t *ifname, register int unit,
-    register int8_t *ebuf)
+get_dlpi_ppa(int fd, const int8_t *ifname, int unit, int8_t *ebuf)
 {
-    register const int8_t *cp;
-    register int kd;
+    const int8_t *cp;
+    int kd;
     void *addr;
     struct ifnet ifnet;
     int8_t if_name[sizeof(ifnet.if_name)], tifname[32];
@@ -671,16 +668,14 @@ get_dlpi_ppa(register int fd, register const int8_t *ifname, register int unit,
             }
     }
 
-    snprintf(ebuf, LIBNET_ERRBUF_SIZE,
-             "Can't find %s", ifname);
+    snprintf(ebuf, LIBNET_ERRBUF_SIZE, "Can't find %s", ifname);
     return (-1);
 }
 
 static int
-dlpi_kread(register int fd, register off_t addr, register void *buf,
-register uint len, register int8_t *ebuf)
+dlpi_kread(int fd, off_t addr, void *buf, uint len, int8_t *ebuf)
 {
-    register int cc;
+    int cc;
 
     if (lseek(fd, addr, SEEK_SET) < 0)
     {
diff --git a/src/libnet_link_nit.c b/src/libnet_link_nit.c
index cfbe113..15457df 100644
--- a/src/libnet_link_nit.c
+++ b/src/libnet_link_nit.c
@@ -46,7 +46,7 @@ struct libnet_link_int *
 libnet_open_link_interface(int8_t *device, int8_t *ebuf)
 {
     struct sockaddr_nit snit;
-    register struct libnet_link_int *l;
+    struct libnet_link_int *l;
 
     l = (struct libnet_link_int *)malloc(sizeof(*p));
     if (l == NULL)
diff --git a/src/libnet_link_pf.c b/src/libnet_link_pf.c
index 0b601e0..1d7bbbe 100644
--- a/src/libnet_link_pf.c
+++ b/src/libnet_link_pf.c
@@ -48,7 +48,7 @@
 struct libnet_link_int *
 libnet_open_link_interface(int8_t *device, int8_t *ebuf)
 {
-    register struct libnet_link_int *l;
+    struct libnet_link_int *l;
     int16_t enmode;
     int backlog = -1;   /* request the most */
     struct enfilter Filter;
diff --git a/src/libnet_link_snit.c b/src/libnet_link_snit.c
index f19f582..7aad755 100644
--- a/src/libnet_link_snit.c
+++ b/src/libnet_link_snit.c
@@ -52,7 +52,7 @@ libnet_open_link_interface(int8_t *device, int8_t *ebuf)
     struct strioctl si;	    /* struct for ioctl() */
     struct ifreq ifr;       /* interface request struct */
     static int8_t dev[] = "/dev/nit";
-    register struct libnet_link_int *l;
+    struct libnet_link_int *l;
 
     l = (struct libnet_link_int *)malloc(sizeof(*l));
     if (l == NULL)
diff --git a/src/libnet_resolve.c b/src/libnet_resolve.c
index 3fc5f5f..21fa069 100644
--- a/src/libnet_resolve.c
+++ b/src/libnet_resolve.c
@@ -359,7 +359,7 @@ uint32_t
 libnet_get_ipaddr4(libnet_t *l)
 {
     struct ifreq ifr;
-    register struct sockaddr_in *sin;
+    struct sockaddr_in *sin;
     int fd;
 
     if (l == NULL)