invutil/fstab.c | 4 ++-- invutil/invidx.c | 4 ++-- invutil/list.c | 2 +- invutil/list.h | 2 +- invutil/stobj.c | 12 ++++++------ m4/package_attrdev.m4 | 8 -------- m4/package_xfslibs.m4 | 12 ------------ 7 files changed, 12 insertions(+), 32 deletions(-) diff --git a/invutil/fstab.c b/invutil/fstab.c index a268244..9c6f441 100644 --- a/invutil/fstab.c +++ b/invutil/fstab.c @@ -247,7 +247,7 @@ generate_fstab_menu(char * inv_path, node_t *startnode, int level, char *fstabna } snprintf(txt, len, " fs: %s", fstab_entry[i].ft_mountpt); - n = list_add(n, node_create(BOOL_FALSE, /* hidden */ + n = node_list_add(n, node_create(BOOL_FALSE, /* hidden */ BOOL_FALSE, /* expanded */ level, /* level */ BOOL_FALSE, /* deleted */ @@ -262,7 +262,7 @@ generate_fstab_menu(char * inv_path, node_t *startnode, int level, char *fstabna list = n; } if(n == NULL) { - fprintf(stderr, "%s: internal memory error: list_add: node_create: fstab\n", g_programName); + fprintf(stderr, "%s: internal memory error: node_list_add: node_create: fstab\n", g_programName); exit(1); } diff --git a/invutil/invidx.c b/invutil/invidx.c index 08472b3..d19eecf 100644 --- a/invutil/invidx.c +++ b/invutil/invidx.c @@ -941,7 +941,7 @@ generate_invidx_menu(char * inv_path, node_t *startnode, int level, char *idxFil } snprintf(txt, len, " inv file: %s ", basename(invidx_entry[i].ie_filename)); - n = list_add(n, node_create(BOOL_TRUE, /* hidden */ + n = node_list_add(n, node_create(BOOL_TRUE, /* hidden */ BOOL_FALSE, /* expanded */ level, /* level */ BOOL_FALSE, /* deleted */ @@ -953,7 +953,7 @@ generate_invidx_menu(char * inv_path, node_t *startnode, int level, char *idxFil 0, /* nbr_children */ i)); /* data_idx */ if(n == NULL) { - fprintf(stderr, "%s: internal memory error: list_add: node_create: invidx\n", + fprintf(stderr, "%s: internal memory error: node_list_add: node_create: invidx\n", g_programName); exit(1); } diff --git a/invutil/list.c b/invutil/list.c index 0157102..808bf98 100644 --- a/invutil/list.c +++ b/invutil/list.c @@ -96,7 +96,7 @@ node_free(node_t *node) } node_t * -list_add(node_t *prevnode, node_t *newnode) +node_list_add(node_t *prevnode, node_t *newnode) { if(newnode == NULL) return NULL; diff --git a/invutil/list.h b/invutil/list.h index b499b74..c1ff26d 100644 --- a/invutil/list.h +++ b/invutil/list.h @@ -46,7 +46,7 @@ void node_free(node_t *node); node_t *node_create(int hidden, int expanded, int level, int deleted, int file_idx, char *text, struct menu_ops_s *ops, node_t *parent, node_t **children, int nbr_children, int data_idx); -node_t *list_add(node_t *prevnode, node_t *newnode); +node_t *node_list_add(node_t *prevnode, node_t *newnode); node_t *list_del(node_t *node); node_t *free_all_children(node_t *node); node_t *mark_all_children_commited(node_t *node); diff --git a/invutil/stobj.c b/invutil/stobj.c index 85de043..fb6b215 100644 --- a/invutil/stobj.c +++ b/invutil/stobj.c @@ -426,7 +426,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) session->header->sh_level, session->session->s_label); - n = list_add(n, node_create(BOOL_TRUE, /* hidden */ + n = node_list_add(n, node_create(BOOL_TRUE, /* hidden */ BOOL_FALSE, /* expanded */ level, /* level */ session->header->sh_pruned, /* deleted */ @@ -438,7 +438,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) 0, /* nbr_children */ data_idx)); if(n == NULL) { - fprintf(stderr, "%s: internal memory error: list_add: node_create: session\n", g_programName); + fprintf(stderr, "%s: internal memory error: node_list_add: node_create: session\n", g_programName); exit(1); } @@ -459,7 +459,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) } snprintf(txt, len, " stream: drive path: %s", StObjstrm->st_cmdarg); - n = list_add(n, node_create(BOOL_TRUE, /* hidden */ + n = node_list_add(n, node_create(BOOL_TRUE, /* hidden */ BOOL_FALSE, /* expanded */ level + 1, /* level */ session->header->sh_pruned, /* deleted */ @@ -471,7 +471,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) 0, /* nbr_children */ data_idx)); if(n == NULL) { - fprintf(stderr, "%s: internal memory error: list_add: node_create: StObjstrm\n", g_programName); + fprintf(stderr, "%s: internal memory error: node_list_add: node_create: StObjstrm\n", g_programName); exit(1); } @@ -492,7 +492,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) } snprintf(txt, len, " media file: %s", StObjmed->mf_label); - n = list_add(n, node_create(BOOL_TRUE, /* hidden */ + n = node_list_add(n, node_create(BOOL_TRUE, /* hidden */ BOOL_FALSE, /* expanded */ level + 2, /* level */ session->header->sh_pruned, /* deleted */ @@ -504,7 +504,7 @@ generate_stobj_menu(node_t *startnode, int level, char *StObjFileName) 0, /* nbr_children */ data_idx)); if(n == NULL) { - fprintf(stderr, "%s: internal memory error: list_add: node_create: StObjmed\n", g_programName); + fprintf(stderr, "%s: internal memory error: node_list_add: node_create: StObjmed\n", g_programName); exit(1); } diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4 index 461ddff..2db4fc2 100644 --- a/m4/package_attrdev.m4 +++ b/m4/package_attrdev.m4 @@ -46,10 +46,6 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR], exit 1 ]) libattr="-lattr" - test -f `pwd`/../attr/libattr/libattr.la && \ - libattr="`pwd`/../attr/libattr/libattr.la" - test -f ${libexecdir}${libdirsuffix}/libattr.la && \ - libattr="${libexecdir}${libdirsuffix}/libattr.la" AC_SUBST(libattr) ]) @@ -62,10 +58,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR], exit 1 ]) libattr="-lattr" - test -f `pwd`/../attr/libattr/libattr.la && \ - libattr="`pwd`/../attr/libattr/libattr.la" - test -f ${libexecdir}${libdirsuffix}/libattr.la && \ - libattr="${libexecdir}${libdirsuffix}/libattr.la" AC_SUBST(libattr) ]) diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index 20da42c..ba93d5b 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -40,10 +40,6 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS], exit 1 ]) libxfs="-lxfs" - test -f `pwd`/../xfsprogs/libxfs/libxfs.la && \ - libxfs="`pwd`/../xfsprogs/libxfs/libxfs.la" - test -f ${libexecdir}${libdirsuffix}/libxfs.la && \ - libxfs="${libexecdir}${libdirsuffix}/libxfs.la" AC_SUBST(libxfs) ]) @@ -56,10 +52,6 @@ AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE], exit 1 ]) libhdl="-lhandle" - test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ - libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" - test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ - libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) ]) @@ -72,10 +64,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], exit 1 ]) libhdl="-lhandle" - test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ - libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" - test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ - libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) ])