refactor work

bin/xbps-alternatives/main.c

@@ -35,6 +35,8 @@
 
 #include <xbps.h>
 
+#include "macro.h"
+
 static void __attribute__((noreturn))
 usage(bool fail)
 {
@@ -228,9 +230,9 @@ main(int argc, char **argv)
 	memset(&xh, 0, sizeof(xh));
 	xh.state_cb = state_cb;
 	if (rootdir)
-		xbps_strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
+		strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
 	if (confdir)
-		xbps_strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
+		strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
 
 	xh.flags = flags;
 

bin/xbps-checkvers/main.c

@@ -26,21 +26,24 @@
  *
  */
 
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <assert.h>
 
 #include <xbps.h>
 
+#include "macro.h"
+
 #define GOT_PKGNAME_VAR 	0x1
 #define GOT_VERSION_VAR 	0x2
 #define GOT_REVISION_VAR 	0x4
@@ -110,10 +113,10 @@ rcv_init(rcv_t *rcv, const char *prog)
 	assert(rcv->cache);
 
 	if (rcv->xbps_conf != NULL) {
-		xbps_strlcpy(rcv->xhp.confdir, rcv->xbps_conf, sizeof(rcv->xhp.confdir));
+		strlcpy(rcv->xhp.confdir, rcv->xbps_conf, sizeof(rcv->xhp.confdir));
 	}
 	if (rcv->rootdir != NULL) {
-		xbps_strlcpy(rcv->xhp.rootdir, rcv->rootdir, sizeof(rcv->xhp.rootdir));
+		strlcpy(rcv->xhp.rootdir, rcv->rootdir, sizeof(rcv->xhp.rootdir));
 	}
 	if (xbps_init(&rcv->xhp) != 0)
 		abort();
@@ -817,8 +820,8 @@ main(int argc, char **argv)
 		if ((p = strrchr(argv[i], '/')) && (strcmp(p, "/template")) == 0) {
 			tmpl = argv[i];
 		} else {
-			xbps_strlcat(tmp, argv[i], sizeof tmp);
-			xbps_strlcat(tmp, "/template", sizeof tmp);
+			strlcat(tmp, argv[i], sizeof tmp);
+			strlcat(tmp, "/template", sizeof tmp);
 			tmpl = tmp;
 		}
 		rcv_process_file(&rcv, tmpl, rcv_check_version);

bin/xbps-create/main.c

@@ -22,27 +22,30 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ftw.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <locale.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <ftw.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <locale.h>
-#include <dirent.h>
 
 #include <xbps.h>
+
+#include "macro.h"
 #include "queue.h"
 
 #ifdef __clang__

bin/xbps-dgraph/main.c

@@ -598,9 +598,9 @@ main(int argc, char **argv)
 	/* Initialize libxbps */
 	memset(&xh, 0, sizeof(xh));
 	if (rootdir != NULL)
-		xbps_strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
+		strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
 	if (confdir)
-		xbps_strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
+		strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
 
 	xh.flags = flags;
 	if ((rv = xbps_init(&xh)) != 0)

bin/xbps-fbulk/main.c

@@ -47,24 +47,26 @@
  * Only one attempt is made to build any given package, no matter how many
  * other packages depend on it.
  */
-#define _DEFAULT_SOURCE
-#define _BSD_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include <assert.h>
-#include <libgen.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
+
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <getopt.h>
+#include <libgen.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <xbps.h>
+
+#include "macro.h"
 #include "uthash.h"
 
 #ifndef __arraycount

bin/xbps-install/main.c

@@ -35,7 +35,9 @@
 #include <getopt.h>
 
 #include <xbps.h>
+
 #include "defs.h"
+#include "macro.h"
 
 static void __attribute__((noreturn))
 usage(bool fail)
@@ -214,11 +216,11 @@ main(int argc, char **argv)
 	xh.fetch_cb = fetch_file_progress_cb;
 	xh.fetch_cb_data = &xfer;
 	if (rootdir)
-		xbps_strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
+		strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
 	if (cachedir)
-		xbps_strlcpy(xh.cachedir, cachedir, sizeof(xh.cachedir));
+		strlcpy(xh.cachedir, cachedir, sizeof(xh.cachedir));
 	if (confdir)
-		xbps_strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
+		strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
 	xh.flags = flags;
 	if (flags & XBPS_FLAG_VERBOSE)
 		xh.unpack_cb = unpack_progress_cb;

bin/xbps-install/state_cb.c

@@ -23,13 +23,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <syslog.h>
-#include <assert.h>
+
 #include <xbps.h>
+
 #include "defs.h"
+#include "macro.h"
 
 int
 state_cb(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED)

bin/xbps-install/transaction.c

@@ -400,6 +400,7 @@ exec_transaction(struct xbps_handle *xhp, unsigned int maxcols, bool yes, bool d
 	trans->d = xhp->transd;
 	trans->iter = xbps_array_iter_from_dict(xhp->transd, "packages");
 	assert(trans->iter);
+	/* XXX: assert with side effect */
 
 	/*
 	 * dry-run mode, show what would be done but don't run anything.

bin/xbps-pkgdb/check.c

@@ -24,16 +24,19 @@
  */
 
 #include <sys/param.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <errno.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <xbps.h>
+
 #include "defs.h"
+#include "macro.h"
 
 static int
 pkgdb_cb(struct xbps_handle *xhp UNUSED,

bin/xbps-pkgdb/check_pkg_unneeded.c

@@ -23,17 +23,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <unistd.h>
-#include <sys/param.h>
 
 #include <xbps.h>
+
 #include "defs.h"
+#include "macro.h"
 
 /*
  * Checks package integrity of an installed package.

bin/xbps-pkgdb/main.c

@@ -23,15 +23,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <errno.h>
+#include <getopt.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <errno.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static void __attribute__((noreturn))
@@ -143,9 +144,9 @@ main(int argc, char **argv)
 
 	memset(&xh, 0, sizeof(xh));
 	if (rootdir)
-		xbps_strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
+		strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
 	if (confdir)
-		xbps_strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
+		strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
 	xh.flags = flags;
 
 	if ((rv = xbps_init(&xh)) != 0) {

bin/xbps-query/list.c

@@ -24,14 +24,18 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <errno.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
-#include <assert.h>
+
+#include <xbps.h>
 
 #include "defs.h"
+#include "macro.h"
 
 struct list_pkgver_cb {
 	unsigned int pkgver_len;

bin/xbps-query/main.c

@@ -23,13 +23,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
-#include <errno.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static void __attribute__((noreturn))
@@ -240,11 +241,11 @@ main(int argc, char **argv)
 	 * Initialize libxbps.
 	 */
 	if (rootdir)
-		xbps_strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
+		strlcpy(xh.rootdir, rootdir, sizeof(xh.rootdir));
 	if (cachedir)
-		xbps_strlcpy(xh.cachedir, cachedir, sizeof(xh.cachedir));
+		strlcpy(xh.cachedir, cachedir, sizeof(xh.cachedir));
 	if (confdir)
-		xbps_strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
+		strlcpy(xh.confdir, confdir, sizeof(xh.confdir));
 
 	xh.flags = flags;
 

bin/xbps-query/ownedby.c

@@ -23,18 +23,20 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h>
+#include <dirent.h>
 #include <errno.h>
 #include <fnmatch.h>
-#include <dirent.h>
-#include <assert.h>
 #include <regex.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <xbps.h>
+
 #include "defs.h"
+#include "macro.h"
 
 struct ffdata {
 	bool rematch;