stty: simplify linewrapping code a bit

[oweals/busybox.git] / networking / udhcp / options.c

diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index e81d0a7575d266a71afc338abefea217f562f9e5..6526472297ed7b24c89d61fde99fad9ffec0af42 100644 (file)
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * options.c -- DHCP server option packet tools
  * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
@@ -6,10 +7,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "dhcpd.h"
 #include "options.h"
 #include "files.h"
-#include "common.h"
 
 
 /* supported options are easily added here */
@@ -72,12 +73,12 @@ uint8_t *get_option(struct dhcpMessage *packet, int code)
        length = 308;
        while (!done) {
                if (i >= length) {
-                       LOG(LOG_WARNING, "bogus packet, option fields too long.");
+                       bb_error_msg("Bogus packet, option fields too long");
                        return NULL;
                }
                if (optionptr[i + OPT_CODE] == code) {
                        if (i + 1 + optionptr[i + OPT_LEN] >= length) {
-                               LOG(LOG_WARNING, "bogus packet, option fields too long.");
+                               bb_error_msg("Bogus packet, option fields too long");
                                return NULL;
                        }
                        return optionptr + i + 2;
@@ -88,7 +89,7 @@ uint8_t *get_option(struct dhcpMessage *packet, int code)
                        break;
                case DHCP_OPTION_OVER:
                        if (i + 1 + optionptr[i + OPT_LEN] >= length) {
-                               LOG(LOG_WARNING, "bogus packet, option fields too long.");
+                               bb_error_msg("Bogus packet, option fields too long");
                                return NULL;
                        }
                        over = optionptr[i + 3];
@@ -136,10 +137,11 @@ int add_option_string(uint8_t *optionptr, uint8_t *string)
 
        /* end position + string length + option code/length + end option */
        if (end + string[OPT_LEN] + 2 + 1 >= 308) {
-               LOG(LOG_ERR, "Option 0x%02x did not fit into the packet!", string[OPT_CODE]);
+               bb_error_msg("Option 0x%02x did not fit into the packet",
+                               string[OPT_CODE]);
                return 0;
        }
-       DEBUG(LOG_INFO, "adding option 0x%02x", string[OPT_CODE]);
+       DEBUG("adding option 0x%02x", string[OPT_CODE]);
        memcpy(optionptr + end, string, string[OPT_LEN] + 2);
        optionptr[end + string[OPT_LEN] + 2] = DHCP_END;
        return string[OPT_LEN] + 2;
@@ -154,12 +156,11 @@ int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
        for (dh=dhcp_options; dh->code; dh++) {
                if (dh->code == code) {
                        uint8_t option[6], len;
-                       
+
                        option[OPT_CODE] = code;
                        len = option_lengths[dh->flags & TYPE_MASK];
                        option[OPT_LEN] = len;
-                       if (__BYTE_ORDER == __BIG_ENDIAN) 
-                               data <<= 8 * (4 - len);
+                       if (BB_BIG_ENDIAN) data <<= 8 * (4 - len);
                        /* This memcpy is for broken processors which can't
                         * handle a simple unaligned 32-bit assignment */
                        memcpy(&option[OPT_DATA], &data, 4);
@@ -167,7 +168,6 @@ int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
                }
        }
 
-       DEBUG(LOG_ERR, "Could not add option 0x%02x", code);
+       bb_error_msg("Could not add option 0x%02x", code);
        return 0;
 }
-