commit: c5047e31515b4c9be76bf4725b4d647aae6b43ca
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 10 13:30:22 2026 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 10 13:32:04 2026 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=c5047e31
libq/array: renamed from xarray
rename xarray to array and fix all #include-s, no other changes
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
applets.h | 3 ++-
libq/Makefile.am | 2 +-
libq/{xarray.c => array.c} | 2 +-
libq/{xarray.h => array.h} | 0
libq/dep.c | 2 +-
libq/dep.h | 4 ++--
libq/set.h | 4 ++--
qcheck.c | 2 +-
qdepends.c | 2 +-
qgrep.c | 4 ++--
qlop.c | 4 ++--
qpkg.c | 2 +-
qsearch.c | 4 ++--
qsize.c | 2 +-
quse.c | 4 ++--
15 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/applets.h b/applets.h
index 4434c8f..bb8323d 100644
--- a/applets.h
+++ b/applets.h
@@ -31,7 +31,8 @@ extern int getopt_long(int, char * const *, const char *,
#include <stdbool.h>
#include <dirent.h>
-#include "xarray.h"
+#include "array.h"
+#include "set.h"
/* applet prototypes */
typedef int (*APPLET)(int, char **);
diff --git a/libq/Makefile.am b/libq/Makefile.am
index 77ab467..b69226c 100644
--- a/libq/Makefile.am
+++ b/libq/Makefile.am
@@ -1,5 +1,6 @@
QFILES = \
+ array.c array.h \
atom.c atom.h \
basename.c basename.h \
busybox.h \
@@ -20,7 +21,6 @@ QFILES = \
scandirat.c scandirat.h \
set.c set.h \
tree.c tree.h \
- xarray.c xarray.h \
xasprintf.h \
xchdir.c xchdir.h \
xmkdir.c xmkdir.h \
diff --git a/libq/xarray.c b/libq/array.c
similarity index 98%
rename from libq/xarray.c
rename to libq/array.c
index fefc80b..ac459c9 100644
--- a/libq/xarray.c
+++ b/libq/array.c
@@ -13,7 +13,7 @@
#include <string.h>
#include <xalloc.h>
-#include "xarray.h"
+#include "array.h"
#define ARRAY_INC_SIZE 32
diff --git a/libq/xarray.h b/libq/array.h
similarity index 100%
rename from libq/xarray.h
rename to libq/array.h
diff --git a/libq/dep.c b/libq/dep.c
index 6b41c8e..6684861 100644
--- a/libq/dep.c
+++ b/libq/dep.c
@@ -17,11 +17,11 @@
#include <assert.h>
#include <ctype.h>
+#include "array.h"
#include "atom.h"
#include "dep.h"
#include "set.h"
#include "tree.h"
-#include "xarray.h"
#include "xasprintf.h"
static const dep_node null_node = {
diff --git a/libq/dep.h b/libq/dep.h
index 093b08f..abcbaea 100644
--- a/libq/dep.h
+++ b/libq/dep.h
@@ -1,16 +1,16 @@
/*
- * Copyright 2005-2025 Gentoo Foundation
+ * Copyright 2005-2026 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*/
#ifndef _DEP_H
#define _DEP_H 1
+#include "array.h"
#include "atom.h"
#include "colors.h"
#include "set.h"
#include "tree.h"
-#include "xarray.h"
typedef enum {
DEP_NULL = 0,
diff --git a/libq/set.h b/libq/set.h
index 219602e..9d321d2 100644
--- a/libq/set.h
+++ b/libq/set.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 Gentoo Foundation
+ * Copyright 2005-2026 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*/
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "xarray.h"
+#include "array.h"
typedef struct elem_t set_elem;
typedef struct set_t set;
diff --git a/qcheck.c b/qcheck.c
index 528e46a..324dcf8 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -15,13 +15,13 @@
#include <sys/stat.h>
#include <fcntl.h>
+#include "array.h"
#include "atom.h"
#include "contents.h"
#include "copy_file.h"
#include "hash.h"
#include "prelink.h"
#include "tree.h"
-#include "xarray.h"
#include "xasprintf.h"
#include "xregex.h"
diff --git a/qdepends.c b/qdepends.c
index 3429288..cb2aec7 100644
--- a/qdepends.c
+++ b/qdepends.c
@@ -14,11 +14,11 @@
#include <xalloc.h>
#include <assert.h>
+#include "array.h"
#include "atom.h"
#include "dep.h"
#include "set.h"
#include "tree.h"
-#include "xarray.h"
#include "xasprintf.h"
#include "xregex.h"
diff --git a/qgrep.c b/qgrep.c
index ccb4d5a..66572e5 100644
--- a/qgrep.c
+++ b/qgrep.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 Gentoo Foundation
+ * Copyright 2005-2026 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005 Petteri Räty - <[email protected]>
@@ -18,9 +18,9 @@
#include <sys/stat.h>
#include <fcntl.h>
+#include "array.h"
#include "atom.h"
#include "tree.h"
-#include "xarray.h"
#include "xchdir.h"
#include "xregex.h"
diff --git a/qlop.c b/qlop.c
index 737d859..b8fd5d5 100644
--- a/qlop.c
+++ b/qlop.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 Gentoo Foundation
+ * Copyright 2005-2026 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2010 Ned Ludd - <[email protected]>
@@ -18,11 +18,11 @@
#include <limits.h>
#include <sys/stat.h>
+#include "array.h"
#include "atom.h"
#include "eat_file.h"
#include "scandirat.h"
#include "set.h"
-#include "xarray.h"
#include "xasprintf.h"
#define QLOP_DEFAULT_LOGFILE "emerge.log"
diff --git a/qpkg.c b/qpkg.c
index 0eb3c68..da15171 100644
--- a/qpkg.c
+++ b/qpkg.c
@@ -23,6 +23,7 @@
# include <archive_entry.h>
#endif
+#include "array.h"
#include "atom.h"
#include "basename.h"
#include "contents.h"
@@ -31,7 +32,6 @@
#include "scandirat.h"
#include "set.h"
#include "tree.h"
-#include "xarray.h"
#include "xasprintf.h"
#include "xchdir.h"
#include "xmkdir.h"
diff --git a/qsearch.c b/qsearch.c
index 31b183c..814cca5 100644
--- a/qsearch.c
+++ b/qsearch.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2020 Gentoo Authors
+ * Copyright 2005-2026 Gentoo Authors
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2010 Ned Ludd - <[email protected]>
@@ -18,11 +18,11 @@
#include <sys/stat.h>
#include <fcntl.h>
+#include "array.h"
#include "atom.h"
#include "basename.h"
#include "rmspace.h"
#include "tree.h"
-#include "xarray.h"
#include "xregex.h"
#define QSEARCH_FLAGS "asSNHRF:" COMMON_FLAGS
diff --git a/qsize.c b/qsize.c
index c0c45c0..d74ebe6 100644
--- a/qsize.c
+++ b/qsize.c
@@ -48,11 +48,11 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include "array.h"
#include "atom.h"
#include "contents.h"
#include "human_readable.h"
#include "tree.h"
-#include "xarray.h"
#include "xregex.h"
#define QSIZE_FLAGS "fsSmkbi:F:" COMMON_FLAGS
diff --git a/quse.c b/quse.c
index ad0d9a2..b70eb35 100644
--- a/quse.c
+++ b/quse.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2021 Gentoo Foundation
+ * Copyright 2005-2026 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2010 Ned Ludd - <[email protected]>
@@ -21,10 +21,10 @@
#include <ctype.h>
#include <assert.h>
+#include "array.h"
#include "set.h"
#include "rmspace.h"
#include "tree.h"
-#include "xarray.h"
#include "xregex.h"
#define QUSE_FLAGS "eaLDIp:RF:" COMMON_FLAGS
