cli: clean up code

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index cc59006..34250b4 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -10,14 +10,6 @@
 #include "libubus.h"
 #include "ubusmsg.h"
 
-#define DEBUG 1
-
-#ifdef DEBUG
-#define DPRINTF(_format, ...) fprintf(stderr, "ubus: " _format, ## __VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
 #define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) }
 
 const char *__ubus_strerror[__UBUS_STATUS_LAST] = {
@@ -153,7 +145,7 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
        if (blob_raw_len(hdr->data) < sizeof(*hdr->data))
                return false;
 
-       if (blob_raw_len(hdr->data) + sizeof(*hdr) > UBUS_MAX_MSGLEN)
+       if (blob_pad_len(hdr->data) > UBUS_MAX_MSGLEN)
                return false;
 
        return true;
@@ -355,9 +347,6 @@ static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
        case UBUS_MSG_INVOKE:
                ubus_process_invoke(ctx, hdr);
                break;
-       default:
-               DPRINTF("unknown message type: %d\n", hdr->type);
-               break;
        }
 }