rpms/dcbd/devel dcbd-0.9.15-lookup-string.patch,1.2,1.3

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1130

Modified Files:
	dcbd-0.9.15-lookup-string.patch 
Log Message:
correction of lookup string patch to match new sources

dcbd-0.9.15-lookup-string.patch:
 config.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Index: dcbd-0.9.15-lookup-string.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd-0.9.15-lookup-string.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dcbd-0.9.15-lookup-string.patch	5 Oct 2009 07:28:04 -0000	1.2
+++ dcbd-0.9.15-lookup-string.patch	8 Oct 2009 09:09:06 -0000	1.3
@@ -1,15 +1,15 @@
 --- dcbd-0.9.15/config.c.old	2009-10-02 15:38:53.213693022 -0700
 +++ dcbd-0.9.15/config.c	2009-10-02 15:39:30.135703553 -0700
-@@ -69,6 +69,8 @@ int init_cfg(void)
- {
- 	config_setting_t *root;
+@@ -70,6 +70,8 @@ int init_cfg(void)
+ 	if (cfg_loaded == TRUE)
+ 		return CONFIG_OK;
  
 +	config_init(&dcb_cfg);
 +
  	if (!config_read_file(&dcb_cfg, cfg_file_name)) {
  		TRACE("config file failed to load\n")
  		TRACE2("error: ", config_error_text(&dcb_cfg))
-@@ -360,16 +362,15 @@ static dcb_result _set_persistent(char *
+@@ -358,16 +360,15 @@ static dcb_result _set_persistent(char *
  	config_setting_t *setting_traffic = NULL;
  	config_setting_t *setting_value = NULL;
  	char abuf[2*DCB_MAX_TLV_LENGTH + 1];
@@ -29,7 +29,7 @@
  		if (result) {
  			if (result < 0) {
  				/* need to create a new upgraded cfg file */
-@@ -944,17 +945,15 @@ dcb_result get_persistent(char *device_n
+@@ -942,17 +943,15 @@ dcb_result get_persistent(char *device_n
  	config_setting_t *setting_value = NULL;
  	int result = dcb_failed, i;
  	int results[MAX_USER_PRIORITIES];