Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37793023
en ru br
Репозитории ALT
S:3.1.12-alt1
5.1: 3.0.0-alt1
4.1: 2.2.48-alt1
4.0: 2.2.46-alt0.M40.1
+updates:2.2.46-alt0.M40.1
3.0: 2.2.17-alt1
www.altlinux.org/Changes

Группа :: Система/Ядро и оборудование
Пакет: xfsdump

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: xfsdump-2.2.42-alt-list.patch
Скачать


diff --git a/xfsdump/invutil/fstab.c b/xfsdump/invutil/fstab.c
index a268244..9c6f441 100644
--- a/xfsdump/invutil/fstab.c
+++ b/xfsdump/invutil/fstab.c
@@ -247,7 +247,7 @@ generate_fstab_menu(char * inv_path, nod
 	}
 	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, nod
 	    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/xfsdump/invutil/invidx.c b/xfsdump/invutil/invidx.c
index 07a0389..72eb4b1 100644
--- a/xfsdump/invutil/invidx.c
+++ b/xfsdump/invutil/invidx.c
@@ -941,7 +941,7 @@ generate_invidx_menu(char * inv_path, no
 	}
 	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, no
 				    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/xfsdump/invutil/list.c b/xfsdump/invutil/list.c
index 0157102..808bf98 100644
--- a/xfsdump/invutil/list.c
+++ b/xfsdump/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/xfsdump/invutil/list.h b/xfsdump/invutil/list.h
index b499b74..c1ff26d 100644
--- a/xfsdump/invutil/list.h
+++ b/xfsdump/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/xfsdump/invutil/stobj.c b/xfsdump/invutil/stobj.c
index 85de043..fb6b215 100644
--- a/xfsdump/invutil/stobj.c
+++ b/xfsdump/invutil/stobj.c
@@ -426,7 +426,7 @@ generate_stobj_menu(node_t *startnode, i
 		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, i
 				    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, i
 	    }
 	    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, i
 					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, i
 		}
 		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, i
 					    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);
 		}
 
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin