Commit 1084ab2a authored by Pavel Emelyanov's avatar Pavel Emelyanov

headers: Remove util.h from protobuf.h

The util.h it pretty big header, those who need utils
should include it explicitly. Right now some of them
only need xmalloc really.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 3994bd8e
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "protobuf.h" #include "protobuf.h"
#include "pipes.h" #include "pipes.h"
#include "crtools.h" #include "crtools.h"
#include "util.h"
#include "images/autofs.pb-c.h" #include "images/autofs.pb-c.h"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "ptrace.h" #include "ptrace.h"
#include "kerndat.h" #include "kerndat.h"
#include "timerfd.h" #include "timerfd.h"
#include "util.h"
#include "tun.h" #include "tun.h"
#include "namespaces.h" #include "namespaces.h"
#include "pstree.h" #include "pstree.h"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "cr-service.h" #include "cr-service.h"
#include "plugin.h" #include "plugin.h"
#include "criu-log.h" #include "criu-log.h"
#include "util.h"
#include "mount.h" #include "mount.h"
#include "filesystems.h" #include "filesystems.h"
#include "namespaces.h" #include "namespaces.h"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "fs-magic.h" #include "fs-magic.h"
#include "kerndat.h" #include "kerndat.h"
#include "image.h" #include "image.h"
#include "util.h"
#include "mount.h" #include "mount.h"
#include "proc_parse.h" #include "proc_parse.h"
#include "servicefd.h" #include "servicefd.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "external.h" #include "external.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
#include "images/regfile.pb-c.h" #include "images/regfile.pb-c.h"
#include "images/remap-file-path.pb-c.h" #include "images/remap-file-path.pb-c.h"
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "parasite-syscall.h" #include "parasite-syscall.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
#include "images/fs.pb-c.h" #include "images/fs.pb-c.h"
#include "images/ext-file.pb-c.h" #include "images/ext-file.pb-c.h"
......
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <fcntl.h> #include <fcntl.h>
...@@ -11,6 +12,7 @@ ...@@ -11,6 +12,7 @@
#include "cgroup.h" #include "cgroup.h"
#include "lsm.h" #include "lsm.h"
#include "protobuf.h" #include "protobuf.h"
#include "xmalloc.h"
#include "images/inventory.pb-c.h" #include "images/inventory.pb-c.h"
#include "images/pagemap.pb-c.h" #include "images/pagemap.pb-c.h"
......
#ifndef __CR_PROTOBUF_H__ #ifndef __CR_PROTOBUF_H__
#define __CR_PROTOBUF_H__ #define __CR_PROTOBUF_H__
#include "protobuf-desc.h" #include <stdbool.h>
#include "protobuf-desc.h"
#include "compiler.h" #include "compiler.h"
#include "util.h"
struct cr_img; struct cr_img;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "cgroup.h" #include "cgroup.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
#include "images/ns.pb-c.h" #include "images/ns.pb-c.h"
#include "images/userns.pb-c.h" #include "images/userns.pb-c.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "string.h" #include "string.h"
#include "sysctl.h" #include "sysctl.h"
#include "kerndat.h" #include "kerndat.h"
#include "util.h"
#include "protobuf.h" #include "protobuf.h"
#include "images/netdev.pb-c.h" #include "images/netdev.pb-c.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "servicefd.h" #include "servicefd.h"
#include "pagemap.h" #include "pagemap.h"
#include "xmalloc.h"
#include "protobuf.h" #include "protobuf.h"
#include "images/pagemap.pb-c.h" #include "images/pagemap.pb-c.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "autofs.h" #include "autofs.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
#include "images/pipe.pb-c.h" #include "images/pipe.pb-c.h"
#include "images/pipe-data.pb-c.h" #include "images/pipe-data.pb-c.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "cr_options.h" #include "cr_options.h"
#include "bfd.h" #include "bfd.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
/* /*
* To speed up reading of packed objects * To speed up reading of packed objects
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "tty.h" #include "tty.h"
#include "mount.h" #include "mount.h"
#include "dump.h" #include "dump.h"
#include "util.h"
#include "protobuf.h" #include "protobuf.h"
#include "images/pstree.pb-c.h" #include "images/pstree.pb-c.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "bitops.h" #include "bitops.h"
#include "log.h" #include "log.h"
#include "page.h" #include "page.h"
#include "util.h"
#include "protobuf.h" #include "protobuf.h"
#include "images/pagemap.pb-c.h" #include "images/pagemap.pb-c.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "rst-malloc.h" #include "rst-malloc.h"
#include "sockets.h" #include "sockets.h"
#include "sk-inet.h" #include "sk-inet.h"
#include "util.h"
#define PB_ALEN_INET 1 #define PB_ALEN_INET 1
#define PB_ALEN_INET6 4 #define PB_ALEN_INET6 4
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include "protobuf.h" #include "protobuf.h"
#include "xmalloc.h"
#include "images/packet-sock.pb-c.h" #include "images/packet-sock.pb-c.h"
#include "images/fdinfo.pb-c.h" #include "images/fdinfo.pb-c.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "sk-packet.h" #include "sk-packet.h"
#include "namespaces.h" #include "namespaces.h"
#include "net.h" #include "net.h"
#include "xmalloc.h"
#include "fs-magic.h" #include "fs-magic.h"
#ifndef SOCK_DIAG_BY_FAMILY #ifndef SOCK_DIAG_BY_FAMILY
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "rst-malloc.h" #include "rst-malloc.h"
#include "protobuf.h" #include "protobuf.h"
#include "stats.h" #include "stats.h"
#include "util.h"
#include "image.h" #include "image.h"
#include "images/stats.pb-c.h" #include "images/stats.pb-c.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "external.h" #include "external.h"
#include "protobuf.h" #include "protobuf.h"
#include "util.h"
#include "images/tty.pb-c.h" #include "images/tty.pb-c.h"
#include "parasite-syscall.h" #include "parasite-syscall.h"
......
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/if.h> #include <linux/if.h>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
#include "tun.h" #include "tun.h"
#include "net.h" #include "net.h"
#include "namespaces.h" #include "namespaces.h"
#include "xmalloc.h"
#include "images/tun.pb-c.h" #include "images/tun.pb-c.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment