usb_gadget: use libsyscommon package

funcs
 - sys_read_buf(), sys_write_buf(), sys_get_str()
 - sys_set_str(), sys_get_int(), sys_set_int()

Change-Id: I7f303d631d8154deeb64eef71ff7b1d487ccc1a3

diff --git a/src/usb_gadget/usb_client_common.c b/src/usb_gadget/usb_client_common.c
index f08ac61..a8a3912 100644 (file)
--- a/src/usb_gadget/usb_client_common.c
+++ b/src/usb_gadget/usb_client_common.c
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include <linux/limits.h>
 
+#include <libsyscommon/file.h>
 #include <libsyscommon/dbus-systemd.h>
 #include <hal/device/hal-usb_gadget-interface.h>
 
@@ -57,117 +58,6 @@
 #define EXPORT __attribute__ ((visibility("default")))
 #endif
 
-// TODO move to common code
-#if 1
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define SHARED_H_BUF_MAX 255
-
-static inline int sys_read_buf(char *file, char *buf, int len)
-{
-       int fd, r;
-
-       if (!file || !buf || len < 0)
-               return -EINVAL;
-
-       fd = open(file, O_RDONLY);
-       if (fd == -1)
-               return -ENOENT;
-
-       r = read(fd, buf, len);
-       close(fd);
-       if ((r >= 0) && (r < len))
-               buf[r] = '\0';
-       else
-               return -EIO;
-
-       return 0;
-}
-
-static inline int sys_write_buf(char *file, char *buf)
-{
-       int fd, r;
-
-       if (!file || !buf)
-               return -EINVAL;
-
-       fd = open(file, O_WRONLY);
-       if (fd == -1)
-               return -EPERM;
-
-       r = write(fd, buf, strlen(buf));
-       close(fd);
-       if (r < 0)
-               return -EIO;
-
-       return 0;
-}
-
-static inline int sys_get_str(char *fname, char *str, int len)
-{
-       int r;
-
-       if (!fname || !str || len < 0)
-               return -EINVAL;
-
-       r = sys_read_buf(fname, str, len);
-       if (r < 0)
-               return r;
-
-       return 0;
-}
-
-static inline int sys_set_str(char *fname, char *val)
-{
-       int r;
-
-       if (!fname || !val)
-               return -EINVAL;
-
-       r = sys_write_buf(fname, val);
-       if (r < 0)
-               return r;
-
-       return 0;
-}
-
-static inline int sys_get_int(char *fname, int *val)
-{
-       char buf[SHARED_H_BUF_MAX];
-       int r;
-
-       if (!fname || !val)
-               return -EINVAL;
-
-       r = sys_read_buf(fname, buf, sizeof(buf));
-       if (r < 0)
-               return r;
-
-       *val = atoi(buf);
-       return 0;
-}
-
-static inline int sys_set_int(char *fname, int val)
-{
-       char buf[SHARED_H_BUF_MAX];
-       int r;
-
-       if (!fname)
-               return -EINVAL;
-
-       snprintf(buf, sizeof(buf), "%d", val);
-       r = sys_write_buf(fname, buf);
-       if (r < 0)
-               return r;
-
-       return 0;
-}
-#endif
-
 static bool legacy_is_function_supported(struct usb_function *func)
 {
        char buf[PATH_MAX];