rpms/log4c/F-11 Fix-array-priority-names.patch, NONE, 1.1 log4c.spec, 1.3, 1.4

[alexh]

Author: alexh

Update of /cvs/pkgs/rpms/log4c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788

Modified Files:
	log4c.spec 
Added Files:
	Fix-array-priority-names.patch 
Log Message:
* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-6
- Added patch to fix incorrect array length checking (upstream bug 2844132)
- Correctly included patch to fix underquoting in M4 file (bug #507427)


Fix-array-priority-names.patch:
 defaultAppender.c |    9 ++++++---
 test_log4c.c      |    1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE Fix-array-priority-names.patch ---
diff --git a/defaultAppender.c b/defaultAppender.c
index 272b70c..7cbbdf3 100644
--- a/defaultAppender.c
+++ b/defaultAppender.c
@@ -43,6 +43,8 @@ static char *priorityNames[] = {
     "EMERGENCY",
 };
 
+#define NumberOfPriorities (sizeof(priorityNames) / sizeof(priorityNames[0]))
+
 static void doAppend(struct LogAppender* this, struct LogEvent* ev);
 
 static struct DefaultLogAppender {
@@ -64,12 +66,13 @@ static void doAppend(struct LogAppender* this0, struct LogEvent* ev) {
     if (ev->priority < 0) {
         pn = "Negative Priority NOT ALLOWED!!";
     }
-    else if (ev->priority < sizeof(priorityNames)) {
+    else if (ev->priority < NumberOfPriorities) {
         pn = priorityNames[ev->priority];
     } else {
         sprintf(buf, "%s+%d",
-                priorityNames[sizeof(priorityNames)-1],
-                ev->priority - sizeof(priorityNames) + 1);
+                priorityNames[NumberOfPriorities - 1],
+                ev->priority - NumberOfPriorities + 1);
+        pn = buf;
     }
     fprintf(stderr, "%-7s ", pn);
     fprintf(stderr, "%s:%d: ", ev->fileName, ev->lineNum);
diff --git a/test_log4c.c b/test_log4c.c
index 4bb6035..b92d74e 100644
--- a/test_log4c.c
+++ b/test_log4c.c
@@ -45,6 +45,7 @@ int main(int ac, char **av) {
         const char *msg = log_setControlString(av[1]);
         if (*msg) fprintf(stderr, "ERROR: %s\n", msg);
     }
+    CLOG4(Top, 10, "val=%d", 10);
     DEBUG2("val=%d", 1);
     WARNING2("val=%d", 2);
     CDEBUG4(Top, "val=%d%s", 3, "!");

 	  	 


Index: log4c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/F-11/log4c.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- log4c.spec	30 Jul 2009 06:54:30 -0000	1.3
+++ log4c.spec	5 Sep 2009 07:48:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		log4c
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Library for logging application messages
 
 Group:		System Environment/Libraries
@@ -8,6 +8,7 @@ License:	LGPLv2+
 URL:		http://log4c.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		507427-Fix-M4-file.patch
+Patch1:		Fix-array-priority-names.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	expat-devel
 
@@ -29,6 +30,8 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q 
+%patch0
+%patch1
 
 %build
 %configure --disable-static
@@ -62,6 +65,10 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/log4c.m4
 
 %changelog
+* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-6
+- Added patch to fix incorrect array length checking (upstream bug 2844132)
+- Correctly included patch to fix underquoting in M4 file (bug #507427)
+
 * Thu Jul 30 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-5
 - Added patch to fix underquoting in M4 file (bug #507427)