[csw-devel] SF.net SVN: gar:[6165] csw/mgar/pkg/libconfuse/trunk

[d_pocock at users.sourceforge.net]

Revision: 6165
          http://gar.svn.sourceforge.net/gar/?rev=6165&view=rev
Author:   d_pocock
Date:     2009-09-03 10:31:43 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
Add patch from trunk to expose cfg_setopt() function.  Adjust code for skipping tests.

Modified Paths:
--------------
    csw/mgar/pkg/libconfuse/trunk/Makefile
    csw/mgar/pkg/libconfuse/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libconfuse/trunk/files/setopt.diff

Modified: csw/mgar/pkg/libconfuse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libconfuse/trunk/Makefile	2009-09-02 21:05:25 UTC (rev 6164)
+++ csw/mgar/pkg/libconfuse/trunk/Makefile	2009-09-03 10:31:43 UTC (rev 6165)
@@ -8,9 +8,7 @@
 # upstream.
 ifeq ($(GARVERSION),2.6)
 #TEST_TARGET = check
-TEST_SCRIPTS = skip
-test-skip:
-	$(DONADA)
+TEST_SCRIPTS = 
 endif
 
 DESCRIPTION = a configuration file parser library
@@ -25,9 +23,13 @@
 endef
 
 MASTER_SITES = http://bzero.se/confuse/
+PATCHFILES = setopt.diff
 DISTFILES  = confuse-$(GARVERSION).tar.gz
+DISTFILES += $(PATCHFILES)
 DISTNAME = confuse-$(GARVERSION)
 
+EXTRA_DOCS = $(PATCHFILES)
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 

Modified: csw/mgar/pkg/libconfuse/trunk/checksums
===================================================================
--- csw/mgar/pkg/libconfuse/trunk/checksums	2009-09-02 21:05:25 UTC (rev 6164)
+++ csw/mgar/pkg/libconfuse/trunk/checksums	2009-09-03 10:31:43 UTC (rev 6165)
@@ -1 +1,2 @@
 0e883d66f0f58fc33585b430c652aa30  download/confuse-2.6.tar.gz
+5a7d6c8406a18340e7508b4d9d0da2ca  download/setopt.diff

Added: csw/mgar/pkg/libconfuse/trunk/files/setopt.diff
===================================================================
--- csw/mgar/pkg/libconfuse/trunk/files/setopt.diff	                        (rev 0)
+++ csw/mgar/pkg/libconfuse/trunk/files/setopt.diff	2009-09-03 10:31:43 UTC (rev 6165)
@@ -0,0 +1,39 @@
+--- confuse-2.6/src/confuse.c	(revision x)
++++ confuse-2.6/src/confuse.c	(revision y)
+@@ -65,7 +65,6 @@
+ 
+ static int cfg_parse_internal(cfg_t *cfg, int level,
+                               int force_state, cfg_opt_t *force_opt);
+-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value);
+ 
+ #define STATE_CONTINUE 0
+ #define STATE_EOF -1
+@@ -531,7 +530,7 @@
+     }
+ }
+ 
+-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value)
++DLLIMPORT cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value)
+ {
+     cfg_value_t *val = 0;
+     int b;
+--- confuse-2.6/src/confuse.h	(revision x)
++++ confuse-2.6/src/confuse.h	(revision y)
+@@ -839,6 +839,16 @@
+  */
+ DLLIMPORT int __export cfg_parse_boolean(const char *s);
+ 
++/** Set an option (create an instance of an option).
++ *
++ * @param cfg The configuration file context.
++ * @param opt The option definition.
++ * @param value The initial value for the option.
++ *
++ * @return Returns a pointer to the value object.
++ */
++DLLIMPORT cfg_value_t __export *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value);
++
+ /** Return an option given it's name.
+  *
+  * @param cfg The configuration file context.
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.