[syslog-ng]Syslog-NG 1.6.3/1.6.4 broken under OpenBSD 3.5.

[Balazs Scheidler]

2004-07-06, k keltezéssel 18:20-kor Gustavo Chamone ezt írta:
> Folks,
> 
> Syslog-NG 1.6.3 and 1.6.4 fails to compile on OpenBSD 3.5 -- although, 1.6.2
> works 'smoothly'. Compilation stops at:
> 
> In file included from macros.c:64:
> /usr/include/arpa/inet.h:74: warning: `struct in_addr' declared inside
> parameter list
> /usr/include/arpa/inet.h:74: warning: its scope is only this definition or
> declaration, which is probably not what you want.
> /usr/include/arpa/inet.h:75: warning: `struct in_addr' declared inside
> parameter list
> /usr/include/arpa/inet.h:75: warning: parameter has incomplete type
> /usr/include/arpa/inet.h:79: warning: parameter has incomplete type
> /usr/include/arpa/inet.h:85: warning: parameter has incomplete type
> macros.c: In function `format_tzofs':
> macros.c:118: `tm' undeclared (first use in this function)
> macros.c:118: (Each undeclared identifier is reported only once
> macros.c:118: for each function it appears in.)
> *** Error code 1
> 
> Stop in /root/source/syslog-ng/syslog-ng-1.6.3/src.
> *** Error code 1
> 
> Stop in /root/source/syslog-ng/syslog-ng-1.6.3/src (line 253 of Makefile).
> *** Error code 1
> 
> Stop in /root/source/syslog-ng/syslog-ng-1.6.3/src (line 418 of Makefile).
> *** Error code 1
> 
> Stop in /root/source/syslog-ng/syslog-ng-1.6.3 (line 168 of Makefile).
> 
> Keep up the good work!

There was a patch fixing this exact issue, and I thought it was released
with 1.6.4... let me check.

No it was fixed after 1.6.4 was released... too bad. Here's the patch
anyway, I'll have to make a new release then.

--- syslog-ng/src/macros.c:1.4.4.4      Thu May  6 09:37:10 2004
+++ syslog-ng/src/macros.c      Thu May 27 10:09:15 2004
@@ -105,7 +105,7 @@
 }
  
 static size_t
-format_tzofs(char *dest, size_t left)
+format_tzofs(char *dest, size_t left, struct tm *tm)
 {
        size_t length;
  
@@ -336,7 +336,7 @@
                case M_ISODATE_RECVD:
                case M_ISODATE_STAMP:
                        length = strftime(*dest, *left - 1, "%Y-%m-%dT%H:%M:%S", tm);
-                       length = length + format_tzofs((*dest) + length, *left - length - 1);
+                       length = length + format_tzofs((*dest) + length, *left - length - 1, tm);
                        break;
                case M_FULLDATE:
                case M_FULLDATE_RECVD:
@@ -351,7 +351,7 @@
                case M_TZOFFSET:
                case M_TZOFFSET_RECVD:
                case M_TZOFFSET_STAMP:
-                       length = format_tzofs(*dest, *left - 1);
+                       length = format_tzofs(*dest, *left - 1, tm);
                        break;
                case M_TZ:
                case M_TZ_RECVD:


-- 
Bazsi
PGP info: KeyID 9AF8D0A9 Fingerprint CD27 CFB0 802C 0944 9CFD 804E C82C 8EB1