Chris Browne cbbrowne at lists.slony.info
Wed Apr 1 10:11:15 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv17911

Modified Files:
      Tag: REL_2_0_STABLE
	confoptions.c 
Log Message:
Fix bug #71
http://www.slony.info/bugzilla/show_bug.cgi?id=71

- Initial logging of configuration failing on NULL items


Index: confoptions.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** confoptions.c	23 Apr 2008 20:35:43 -0000	1.29
--- confoptions.c	1 Apr 2009 17:11:13 -0000	1.29.2.1
***************
*** 47,51 ****
  	{
  		slon_log(SLON_CONFIG, "main: String option %s = %s\n",
! 				 ConfigureNamesString[i].gen.name, *(ConfigureNamesString[i].variable));
  	}
  
--- 47,51 ----
  	{
  		slon_log(SLON_CONFIG, "main: String option %s = %s\n",
! 				 ConfigureNamesString[i].gen.name, ((*ConfigureNamesString[i].variable)==NULL)?"[NULL]":*(ConfigureNamesString[i].variable));
  	}
  
***************
*** 690,694 ****
  			(const char *) "sync_max_rowsize",	/* conf name */
  			gettext_noop("sl_log_? rows larger than that are read separately"), /* short desc */
! 			gettext_noop("sl_log_? rows larger than that are read separately"), /* long desc */
  			SLON_C_INT			/* config type */
  		},
--- 690,694 ----
  			(const char *) "sync_max_rowsize",	/* conf name */
  			gettext_noop("sl_log_? rows larger than that are read separately"), /* short desc */
! 			gettext_noop("sl_log_? rows with octet_length(log_cmddata) larger than this are read separately"), /* long desc */
  			SLON_C_INT			/* config type */
  		},



More information about the Slony1-commit mailing list