fdset: Beautify fdset opening

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

image.c

@@ -147,7 +147,7 @@ void close_cr_fdset(struct cr_fdset **cr_fdset)
 	*cr_fdset = NULL;
 }
 
-struct cr_fdset *cr_fdset_open(int pid, int from, int to,
+struct cr_fdset *cr_fdset_open_range(int pid, int from, int to,
 			       unsigned long flags)
 {
 	struct cr_fdset *fdset;
@@ -181,12 +181,12 @@ err:
 
 struct cr_fdset *cr_task_fdset_open(int pid, int mode)
 {
-	return cr_fdset_open(pid, _CR_FD_TASK_FROM, _CR_FD_TASK_TO, mode);
+	return cr_fdset_open(pid, TASK, mode);
 }
 
 struct cr_fdset *cr_glob_fdset_open(int mode)
 {
-	return cr_fdset_open(-1 /* ignored */, _CR_FD_GLOB_FROM, _CR_FD_GLOB_TO, mode);
+	return cr_fdset_open(-1 /* ignored */, GLOB, mode);
 }
 
 int open_image_at(int dfd, int type, unsigned long flags, ...)

include/crtools.h

@@ -124,8 +124,10 @@ int cr_exec(int pid, char **opts);
 #define O_RSTR	(O_RDONLY)
 
 struct cr_fdset *cr_task_fdset_open(int pid, int mode);
-struct cr_fdset *cr_fdset_open(int pid, int from, int to,
+struct cr_fdset *cr_fdset_open_range(int pid, int from, int to,
 			       unsigned long flags);
+#define cr_fdset_open(pid, type, flags) cr_fdset_open_range(pid, \
+		_CR_FD_##type##_FROM, _CR_FD_##type##_TO, flags)
 struct cr_fdset *cr_glob_fdset_open(int mode);
 
 void close_cr_fdset(struct cr_fdset **cr_fdset);

ipc_ns.c

@@ -460,7 +460,7 @@ int dump_ipc_ns(int ns_pid, int ns_id)
 	int ret;
 	struct cr_fdset *fdset;
 
-	fdset = cr_fdset_open(ns_id, _CR_FD_IPCNS_FROM, _CR_FD_IPCNS_TO, O_DUMP);
+	fdset = cr_fdset_open(ns_id, IPCNS, O_DUMP);
 	if (fdset == NULL)
 		return -1;
 

namespaces.c

@@ -495,8 +495,7 @@ int try_show_namespaces(int ns_pid)
 	if (ret < 0)
 		return -1;
 
-	fdset = cr_fdset_open(ids->net_ns_id,
-				_CR_FD_NETNS_FROM, _CR_FD_NETNS_TO, O_SHOW);
+	fdset = cr_fdset_open(ids->net_ns_id, NETNS, O_SHOW);
 	if (fdset) {
 		pr_msg("-------------------NETNS---------------------\n");
 		for (i = _CR_FD_NETNS_FROM + 1; i < _CR_FD_NETNS_TO; i++) {
@@ -511,8 +510,7 @@ int try_show_namespaces(int ns_pid)
 		close_cr_fdset(&fdset);
 	}
 
-	fdset = cr_fdset_open(ids->ipc_ns_id,
-				_CR_FD_IPCNS_FROM, _CR_FD_IPCNS_TO, O_SHOW);
+	fdset = cr_fdset_open(ids->ipc_ns_id, IPCNS, O_SHOW);
 	if (fdset) {
 		pr_msg("-------------------IPCNS---------------------\n");
 		for (i = _CR_FD_IPCNS_FROM + 1; i < _CR_FD_IPCNS_TO; i++) {

net.c

@@ -468,7 +468,7 @@ int dump_net_ns(int pid, int ns_id)
 	struct cr_fdset *fds;
 	int ret;
 
-	fds = cr_fdset_open(ns_id, _CR_FD_NETNS_FROM, _CR_FD_NETNS_TO, O_DUMP);
+	fds = cr_fdset_open(ns_id, NETNS, O_DUMP);
 	if (fds == NULL)
 		return -1;