Mercurial > code

changeset 124:5917096facb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use enum and add #ifdef __cplusplus
author David Demelier <markand@malikania.fr>
date Wed, 07 Mar 2012 09:50:41 +0100
parents 59745a235d16
children b9723c197038
files array.c array.h parray.c parray.h
diffstat 4 files changed, 24 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/array.c	Fri Mar 02 21:31:37 2012 +0100
+++ b/array.c	Wed Mar 07 09:50:41 2012 +0100
@@ -24,7 +24,7 @@
 
 #define OFFSET(x)	(arr->unit * (x))
 
-static int	array_grow(struct array *);
+static int	grow(struct array *);
 
 int
 array_init(struct array *arr, size_t unit)
@@ -89,7 +89,7 @@
 int
 array_push(struct array *arr, const void *data)
 {
-	if (array_grow(arr) < 0)
+	if (grow(arr) < 0)
 		return -1;
 
 	memmove((char *)arr->data + arr->unit, arr->data, OFFSET(arr->length++));
@@ -126,7 +126,7 @@
 int
 array_append(struct array *arr, const void *data)
 {
-	if (array_grow(arr) < 0)
+	if (grow(arr) < 0)
 		return -1;
 
 	memcpy((char *)arr->data + OFFSET(arr->length++), data, arr->unit);
@@ -320,7 +320,7 @@
  */
 
 static int
-array_grow(struct array *arr)
+grow(struct array *arr)
 {
 	if ((arr->size / arr->unit) > (size_t) arr->length)
 		return 0;
--- a/array.h	Fri Mar 02 21:31:37 2012 +0100
+++ b/array.h	Wed Mar 07 09:50:41 2012 +0100
@@ -19,14 +19,20 @@
 #ifndef _ARRAY_H_
 #define _ARRAY_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdarg.h>
 
 #ifndef ARRAY_DEFAULT_BSIZE
 #define ARRAY_DEFAULT_BSIZE	128
 #endif
 
-#define ARRAY_AUTO	0
-#define ARRAY_FIXED	1
+enum {
+	ARRAY_AUTO	= 0,
+	ARRAY_FIXED	= 1
+};
 
 struct array {
 	int	type;	/* array's type (default FIXED) */
@@ -65,4 +71,8 @@
 		(a)->i < (a)->length;						\
 		++(a)->i, ++(var))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ARRAY_H_ */
--- a/parray.c	Fri Mar 02 21:31:37 2012 +0100
+++ b/parray.c	Wed Mar 07 09:50:41 2012 +0100
@@ -24,7 +24,7 @@
 
 #define LENGTH(x)	((x) * (sizeof (void *)))
 
-static int	parray_grow(struct parray *);
+static int	grow(struct parray *);
 
 int
 parray_init(struct parray *arr)
@@ -87,7 +87,7 @@
 int
 parray_push(struct parray *arr, void *data)
 {
-	if (parray_grow(arr) < 0)
+	if (grow(arr) < 0)
 		return -1;
 
 	memmove(&arr->data[1], &arr->data[0], LENGTH(arr->length++));
@@ -124,7 +124,7 @@
 int
 parray_append(struct parray *arr, void *data)
 {
-	if (parray_grow(arr) < 0)
+	if (grow(arr) < 0)
 		return -1;
 
 	arr->data[arr->length++] = data;
@@ -300,7 +300,7 @@
  */
 
 static int
-parray_grow(struct parray *arr)
+grow(struct parray *arr)
 {
 	if ((arr->size / sizeof (void *)) > (size_t) arr->length)
 		return 0;
--- a/parray.h	Fri Mar 02 21:31:37 2012 +0100
+++ b/parray.h	Wed Mar 07 09:50:41 2012 +0100
@@ -29,8 +29,10 @@
 #define PARRAY_DEFAULT_BSIZE	128
 #endif
 
-#define PARRAY_AUTO	0
-#define PARRAY_FIXED	1
+enum {
+	PARRAY_AUTO	= 0,
+	PARRAY_FIXED	= 1
+};
 
 struct parray {
 	int	type;		/* array type (default FIXED) */