[gentoo-commits] gentoo-projects commit in portage-utils/libq: libq.c xarray.c xmalloc.c

[gentoo-commits] gentoo-projects commit in portage-utils/libq: libq.c xarray.c xmalloc.c

[Mike Frysinger (vapier)]

vapier      11/10/03 16:18:25

  Modified:             libq.c xmalloc.c
  Added:                xarray.c
  Log:
  use array helpers from pax-utils

Revision  Changes    Path
1.27                 portage-utils/libq/libq.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?r1=1.26&r2=1.27

Index: libq.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/libq.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libq.c	3 Oct 2011 01:25:54 -0000	1.26
+++ libq.c	3 Oct 2011 16:18:25 -0000	1.27
@@ -28,6 +28,7 @@
 #include "xreadlink.c"
 #include "xregex.c"
 #include "xsystem.c"
+#include "xarray.c"
 
 /* custom libs */
 #include "atom_explode.c"



1.5                  portage-utils/libq/xmalloc.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xmalloc.c?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xmalloc.c?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xmalloc.c?r1=1.4&r2=1.5

Index: xmalloc.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/xmalloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmalloc.c	15 Jan 2008 08:03:34 -0000	1.4
+++ xmalloc.c	3 Oct 2011 16:18:25 -0000	1.5
@@ -27,8 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-void *xmalloc(size_t size);
-void *xmalloc(size_t size)
+static void *xmalloc(size_t size)
 {
 	void *ptr = malloc(size);
 	if (ptr == NULL)
@@ -36,8 +35,7 @@
 	return ptr;
 }
 
-void *xcalloc(size_t nmemb, size_t size);
-void *xcalloc(size_t nmemb, size_t size)
+static void *xcalloc(size_t nmemb, size_t size)
 {
 	void *ptr = calloc(nmemb, size);
 	if (ptr == NULL)
@@ -45,8 +43,7 @@
 	return ptr;
 }
 
-void *xzalloc(size_t size);
-void *xzalloc(size_t size)
+static void *xzalloc(size_t size)
 {
 	void *ptr = xmalloc(size);
 	if (ptr == NULL)
@@ -55,11 +52,17 @@
 	return ptr;
 }
 
-void *xrealloc(void *optr, size_t size);
-void *xrealloc(void *optr, size_t size)
+static void *xrealloc(void *optr, size_t size)
 {
 	void *ptr = realloc(optr, size);
 	if (ptr == NULL)
 		err("Out of memory");
 	return ptr;
 }
+
+static void *xmemdup(const void *src, size_t n)
+{
+	void *ret = xmalloc(n);
+	memcpy(ret, src, n);
+	return ret;
+}



1.1                  portage-utils/libq/xarray.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xarray.c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xarray.c?rev=1.1&content-type=text/plain

Index: xarray.c
===================================================================
/*
 * Copyright 2003-2007 Gentoo Foundation
 * Distributed under the terms of the GNU General Public License v2
 * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xarray.c,v 1.1 2011/10/03 16:18:25 vapier Exp $
 *
 * Copyright 2003-2007 Ned Ludd        - <solar@gentoo.org>
 * Copyright 2004-2007 Mike Frysinger  - <vapier@gentoo.org>
 */

typedef struct {
	void **eles;
	size_t num;
} array_t;

#define xrealloc_array(ptr, size, ele_size) xrealloc(ptr, (size) * (ele_size))
#define array_for_each(arr, n, ele) \
	for (n = 0, ele = arr->eles[n]; n < arr->num; ++n, ele = arr->eles[n])
#define array_init_decl { .eles = NULL, .num = 0, }
#define array_cnt(arr) (arr)->num
#define DECLARE_ARRAY(arr) array_t _##arr = array_init_decl, *arr = &_##arr

static void xarraypush(array_t *arr, const void *ele, size_t ele_len)
{
	size_t n = arr->num++;
	arr->eles = xrealloc_array(arr->eles, arr->num, sizeof(ele));
	arr->eles[n] = xmemdup(ele, ele_len);
}
#define xarraypush_str(arr, ele) xarraypush(arr, ele, strlen(ele) + 1 /*NUL*/)

static void xarrayfree(array_t *arr)
{
	array_t blank = array_init_decl;
	size_t n;

	for (n = 0; n < arr->num; ++n)
		free(arr->eles[n]);
	free(arr->eles);

	*arr = blank;
}