lsns: enhance compilation without USE_NS_GET_API

karelzak · karelzak · commit 05d494d32bd9 · 2025-04-01T14:53:05.000+02:00
- Move add_namespace_for_nsfd() declaration to the #ifdef block (based on c62ed3d) References: 2ced434 Signed-off-by: Karel Zak <kzak@redhat.com>
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
@@ -304,6 +304,9 @@ static inline const struct colinfo *get_column_info(unsigned num)
 }
 
 #ifdef USE_NS_GET_API
+static struct lsns_namespace *add_namespace_for_nsfd(struct lsns *ls, int fd, ino_t ino);
+
+
 /* Get the inode number for the parent namespace of the namespace `fd' specifies.
  * If `pfd' is non-null, the file descriptor opening the parent namespace.*/
 static int get_parent_ns_ino(int fd, enum lsns_type lsns_type, ino_t *pino, int *pfd)
@@ -422,8 +425,6 @@ static int parse_proc_stat(char *line, pid_t *pid, char *state, pid_t *ppid)
 	return rc;
 }
 
-static struct lsns_namespace *add_namespace_for_nsfd(struct lsns *ls, int fd, ino_t ino);
-
 static struct lsns_namespace *get_namespace(struct lsns *ls, ino_t ino)
 {
 	struct list_head *p;

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,9 @@ static inline const struct colinfo *get_column_info(unsigned num)`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`#ifdef USE_NS_GET_API`
	`307`	`+static struct lsns_namespace add_namespace_for_nsfd(struct lsns ls, int fd, ino_t ino);`
	`308`	`+`
	`309`	`+`
`307`	`310`	/* Get the inode number for the parent namespace of the namespace `fd' specifies.
`308`	`311`	* If `pfd' is non-null, the file descriptor opening the parent namespace.*/
`309`	`312`	`static int get_parent_ns_ino(int fd, enum lsns_type lsns_type, ino_t pino, int pfd)`
`@@ -422,8 +425,6 @@ static int parse_proc_stat(char line, pid_t pid, char state, pid_t ppid)`
`422`	`425`	`return rc;`
`423`	`426`	`}`
`424`	`427`
`425`		`-static struct lsns_namespace add_namespace_for_nsfd(struct lsns ls, int fd, ino_t ino);`
`426`		`-`
`427`	`428`	`static struct lsns_namespace get_namespace(struct lsns ls, ino_t ino)`
`428`	`429`	`{`
`429`	`430`	`struct list_head *p;`