Merge branch 'master' into 1.1

[meshlink] / src / solaris / device.c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 43938006b36cf1de794d05c9b94c12e89061d96d..8221b9fd02fadd491f029d4f183964befff0a7da 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -112,9 +112,9 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-       int lenin;
+       int inlen;
 
-       if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+       if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
@@ -131,12 +131,12 @@ bool read_packet(vpn_packet_t *packet) {
                        break;
                default:
                        ifdebug(TRAFFIC) logger(LOG_ERR,
-                                          _ ("Unknown IP version %d while reading packet from %s %s"),
+                                          "Unknown IP version %d while reading packet from %s %s",
                                           packet->data[14] >> 4, device_info, device);
                        return false;
        }
 
-       packet->len = lenin + 14;
+       packet->len = inlen + 14;
 
        device_total_in += packet->len;