OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jan-2008 10:13:49
Branch: HEAD Handle: 2008010509134800
Modified files:
openpkg-src/xar xar.patch xar.spec
Log:
fix xar_iter_new usage and declaration
Summary:
Revision Changes Path
1.5 +46 -1 openpkg-src/xar/xar.patch
1.11 +1 -1 openpkg-src/xar/xar.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xar/xar.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 xar.patch
--- openpkg-src/xar/xar.patch 30 Dec 2007 11:48:39 -0000 1.4
+++ openpkg-src/xar/xar.patch 5 Jan 2008 09:13:48 -0000 1.5
@@ -1,6 +1,18 @@
+Index: include/xar.h.in
+--- include/xar.h.in.orig 2007-12-29 19:49:57 +0100
++++ include/xar.h.in 2008-01-05 10:12:25 +0100
+@@ -138,7 +138,7 @@
+ int32_t xar_prop_create(xar_file_t f, const char *key, const char *value);
+ int32_t xar_prop_get(xar_file_t f, const char *key, const char **value);
+
+-xar_iter_t xar_iter_new();
++xar_iter_t xar_iter_new(void);
+ void xar_iter_free(xar_iter_t i);
+
+ const char *xar_prop_first(xar_file_t f, xar_iter_t i);
Index: lib/Makefile.inc.in
--- lib/Makefile.inc.in.orig 2007-12-29 19:49:57 +0100
-+++ lib/Makefile.inc.in 2007-12-30 12:45:20 +0100
++++ lib/Makefile.inc.in 2008-01-05 10:12:25 +0100
@@ -24,32 +24,14 @@
# Libraries. librxar is created such that it's possible to run xar without
# first installing libxar.
@@ -72,3 +84,36 @@
ifneq ($(words "" $(LIBXAR_L)), 1)
rm -f $(LIBXAR_L)
ln -s $(LIBXAR_SNAME) $(LIBXAR_L)
+Index: lib/filetree.c
+--- lib/filetree.c.orig 2007-12-29 19:49:57 +0100
++++ lib/filetree.c 2008-01-05 10:12:25 +0100
+@@ -263,7 +263,7 @@
+ * Returns a newly allocated iterator for use on files, properties, or
+ * attributes.
+ */
+-xar_iter_t xar_iter_new() {
++xar_iter_t xar_iter_new(void) {
+ xar_iter_t ret = malloc(sizeof(struct __xar_iter_t));
+ if(!ret) return NULL;
+
+Index: lib/stat.c
+--- lib/stat.c.orig 2007-12-29 19:49:57 +0100
++++ lib/stat.c 2008-01-05 10:12:25 +0100
+@@ -724,7 +724,7 @@
+ if( errno == ENOENT ) {
+ xar_iter_t i;
+ const char *ptr;
+- i = xar_iter_new(x);
++ i = xar_iter_new();
+ for(ptr = xar_prop_first(tmpf, i); ptr; ptr =
xar_prop_next(i)) {
+ xar_iter_t a;
+ const char *val = NULL;
+@@ -736,7 +736,7 @@
+ continue;
+
+ xar_prop_set(f, ptr, val);
+- a = xar_iter_new(x);
++ a = xar_iter_new();
+ for(akey = xar_attr_first(tmpf, ptr,
a); akey; akey = xar_attr_next(a)) {
+ aval = xar_attr_get(tmpf, ptr,
akey);
+ xar_attr_set(f, ptr, akey,
aval);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xar/xar.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 xar.spec
--- openpkg-src/xar/xar.spec 1 Jan 2008 15:07:22 -0000 1.10
+++ openpkg-src/xar/xar.spec 5 Jan 2008 09:13:48 -0000 1.11
@@ -32,7 +32,7 @@
Group: Archiver
License: BSD
Version: 1.5.2
-Release: 20080101
+Release: 20080105
# list of sources
Source0: http://xar.googlecode.com/files/xar-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
