nterface-ip: remove superfluous iface check in interface_ip_set_enabled()

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 23795e5..f40e14f 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -14,7 +14,9 @@
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 

+#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <uci_blob.h>

 #include <libubox/list.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/list.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>


@@ -96,10 +98,8 @@ static inline int fls(int x)
         x <<= 2;
         r -= 2;
     }
         x <<= 2;
         r -= 2;
     }

-    if (!(x & 0x80000000u)) {
-        x <<= 1;
+    if (!(x & 0x80000000u))

         r -= 1;
         r -= 1;

-    }

     return r;
 }
 #endif
     return r;
 }
 #endif


@@ -107,11 +107,14 @@ static inline int fls(int x)
 unsigned int parse_netmask_string(const char *str, bool v6);
 bool split_netmask(char *str, unsigned int *netmask, bool v6);
 int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask);
 unsigned int parse_netmask_string(const char *str, bool v6);
 bool split_netmask(char *str, unsigned int *netmask, bool v6);
 int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask);

+bool check_pid_path(int pid, const char *exe);

 
 char * format_macaddr(uint8_t *mac);
 
 uint32_t crc32_file(FILE *fp);
 
 
 char * format_macaddr(uint8_t *mac);
 
 uint32_t crc32_file(FILE *fp);
 

+const char * uci_get_validate_string(const struct uci_blob_param_list *p, int i);
+

 #ifdef __APPLE__
 #define s6_addr32      __u6_addr.__u6_addr32
 #endif
 #ifdef __APPLE__
 #define s6_addr32      __u6_addr.__u6_addr32
 #endif