Revert "Modify variable type"

This reverts commit e793a48a6386c590dac6c541413603fa97835f45.

Change-Id: Ie2ae3e54a8aabbb0392c634678486fe23f571621

diff --git a/Makefile.am b/Makefile.am
index f8ca6c2..35bbbf5 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,6 @@ dlogctrl_LDFLAGS = \
        -pie
 
 dlogctrl_SOURCES = \
-       src/shared/logcommon.c \
        src/shared/logconfig.c \
        src/logctrl/logctrl.c
 

diff --git a/include/logpipe.h b/include/logpipe.h
index a912eb9..038c233 100644 (file)
--- a/include/logpipe.h
+++ b/include/logpipe.h
@@ -36,7 +36,7 @@ enum {
 };
 
 struct dlog_control_msg {
-       unsigned char length;
+       char length;
        char request;
        char flags;
        char data[0];

diff --git a/src/logctrl/logctrl.c b/src/logctrl/logctrl.c
index c723d17..176fe5a 100644 (file)
--- a/src/logctrl/logctrl.c
+++ b/src/logctrl/logctrl.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <logcommon.h>
 #include <logconfig.h>
 #include "logctrl_doc.h"
 
@@ -58,7 +57,7 @@ int main(int argc, char ** argv)
        char val[MAX_CONF_VAL_LEN];
        struct options opt = {0, 0, 0, 0, 0, 0};
        const char *filename = getenv("DLOG_CONFIG_PATH") ? : DEFAULT_CONFIG_PATH;
-       _cleanup_free_ const char *backend = NULL;
+       const char *backend = NULL;
 
        if (argc == 1) {
                print_help(argv[0]);