- isdnlog Version 3.11

- make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
1999-03-25 19:39:41 +00:00 · 1999-03-25 19:39:41 +00:00 · ba136f9495
parent b5708682c9
commit ba136f9495
5 changed files with 36 additions and 14 deletions
--- a/isdnlog/Makefile.in
+++ b/isdnlog/Makefile.in
@ -1,4 +1,4 @@
-## $Id: Makefile.in,v 1.63 1999/03/24 19:37:29 akool Exp $
+## $Id: Makefile.in,v 1.64 1999/03/25 19:39:41 akool Exp $
 ##
 ## ISDN accounting for isdn4linux.
 ##
@ -19,6 +19,10 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
 ## $Log: Makefile.in,v $
+## Revision 1.64  1999/03/25 19:39:41  akool
+## - isdnlog Version 3.11
+## - make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
+##
 ## Revision 1.63  1999/03/24 19:37:29  akool
 ## - isdnlog Version 3.10
 ## - moved "sondernnummern.c" from isdnlog/ to tools/
@ -494,7 +498,7 @@ SERVICEFILE = /etc/services
 # DON'T EDIT BELOW THIS LINE
 ######################################################################

-VERSION     = 3.10
+VERSION     = 3.11

 MANPAGES    = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1

--- a/isdnlog/isdnlog/functions.c
+++ b/isdnlog/isdnlog/functions.c
@ -1,4 +1,4 @@
-/* $Id: functions.c,v 1.19 1999/03/07 18:18:48 akool Exp $
+/* $Id: functions.c,v 1.20 1999/03/25 19:39:48 akool Exp $
 *
 * ISDN accounting for isdn4linux. (log-module)
 *
@ -19,6 +19,10 @@
 * along with this program; if not, write to the Free Software
 *
 * $Log: functions.c,v $
+ * Revision 1.20  1999/03/25 19:39:48  akool
+ * - isdnlog Version 3.11
+ * - make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
+ *
 * Revision 1.19  1999/03/07 18:18:48  akool
 * - new 01805 tarif of DTAG
 * - new March 1999 tarife
@ -180,7 +184,7 @@ static void saveCharge()

 /*****************************************************************************/

-void _Exit(char *File, int Line, int RetCode) /* WARNING: RetCode==-9 does _not_ call exit()! */
+void _Exit_isdnlog(char *File, int Line, int RetCode) /* WARNING: RetCode==-9 does _not_ call exit()! */
 {
 #ifdef Q931
  if (!q931dmp)
@ -421,7 +425,7 @@ int print_msg(int Level, const char *fmt, ...)
      fputs(width ? s : String, stderr);
      fflush(stderr);
    }
-    else 
+    else
    if (!fout){
      fputs(width ? s : String, fcons);
      fflush(fcons);
--- a/isdnlog/isdnlog/isdnlog.c
+++ b/isdnlog/isdnlog/isdnlog.c
@ -1,4 +1,4 @@
-/* $Id: isdnlog.c,v 1.38 1999/03/24 19:37:46 akool Exp $
+/* $Id: isdnlog.c,v 1.39 1999/03/25 19:39:51 akool Exp $
 *
 * ISDN accounting for isdn4linux. (log-module)
 *
@ -19,6 +19,10 @@
 * along with this program; if not, write to the Free Software
 *
 * $Log: isdnlog.c,v $
+ * Revision 1.39  1999/03/25 19:39:51  akool
+ * - isdnlog Version 3.11
+ * - make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
+ *
 * Revision 1.38  1999/03/24 19:37:46  akool
 * - isdnlog Version 3.10
 * - moved "sondernnummern.c" from isdnlog/ to tools/
@ -420,7 +424,7 @@ static void loop(void)
            break;
          } /* else */
        }
-        else if (X_FD_ISSET(sockets[Cnt].descriptor, &readmask))
+        else if (X_FD_ISSET(sockets[Cnt].descriptor, &readmask)) {
          if (sockets[Cnt].fp == NULL) {
            eval_message(Cnt);
            /* Arbeite immer nur ein Client ab, du weisst nicht, ob der
@ -429,6 +433,7 @@ static void loop(void)
          }
          else
            Print_Cmd_Output(Cnt);
+        } /* else */
      } /* for */

      if (xinfo && X_FD_ISSET(sockets[IN_PORT].descriptor, &readmask)) {
--- a/isdnlog/isdnlog/isdnlog.h
+++ b/isdnlog/isdnlog/isdnlog.h
@ -1,4 +1,4 @@
-/* $Id: isdnlog.h,v 1.18 1999/03/24 19:37:49 akool Exp $
+/* $Id: isdnlog.h,v 1.19 1999/03/25 19:39:55 akool Exp $
 *
 * ISDN accounting for isdn4linux.
 *
@ -20,6 +20,10 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 * $Log: isdnlog.h,v $
+ * Revision 1.19  1999/03/25 19:39:55  akool
+ * - isdnlog Version 3.11
+ * - make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
+ *
 * Revision 1.18  1999/03/24 19:37:49  akool
 * - isdnlog Version 3.10
 * - moved "sondernnummern.c" from isdnlog/ to tools/
@ -417,9 +421,9 @@ _EXTERN void clearchan(int chan, int total);
 #define _EXTERN extern
 #endif

-#define Exit(a) _Exit(__FILE__,__LINE__,a)
+#define Exit(a) _Exit_isdnlog(__FILE__,__LINE__,a)

-_EXTERN void _Exit(char *File, int Line, int RetCode);
+_EXTERN void _Exit_isdnlog(char *File, int Line, int RetCode);
 #ifndef  _REP_FUNC_C_
 _EXTERN int  print_msg(int Level, const char *fmt, ...);
 #endif
--- a/isdnlog/isdnlog/processor.c
+++ b/isdnlog/isdnlog/processor.c
@ -1,4 +1,4 @@
-/* $Id: processor.c,v 1.47 1999/03/24 19:37:55 akool Exp $
+/* $Id: processor.c,v 1.48 1999/03/25 19:40:01 akool Exp $
 *
 * ISDN accounting for isdn4linux. (log-module)
 *
@ -19,6 +19,10 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 * $Log: processor.c,v $
+ * Revision 1.48  1999/03/25 19:40:01  akool
+ * - isdnlog Version 3.11
+ * - make isdnlog compile with egcs 1.1.7 (Bug report from Christophe Zwecker <doc@zwecker.com>)
+ *
 * Revision 1.47  1999/03/24 19:37:55  akool
 * - isdnlog Version 3.10
 * - moved "sondernnummern.c" from isdnlog/ to tools/
@ -551,7 +555,6 @@ static char  *asnp, *asnm;
 static int    lfd = 0;
 #endif

-
 #ifdef Q931
 static void Q931dump(int mode, int val, char *msg, int version)
 {
@ -2522,8 +2525,8 @@ static void decode(int chan, register char *p, int type, int version, int tei)

                    warn = 0;

-                    if (*call[chan].onum[CALLING]) /* another Calling-party? */
-                      if (strcmp(call[chan].onum[CALLING], s)) /* different! */
+                    if (*call[chan].onum[CALLING]) { /* another Calling-party? */
+                      if (strcmp(call[chan].onum[CALLING], s)) { /* different! */
                        if ((call[chan].screening == 3) && ((oc3a & 3) < 3)) { /* we believe the first one! */
                          strcpy(call[chan].onum[CLIP], s);
                          buildnumber(s, oc3, oc3a, call[chan].num[CLIP], version, &call[chan].provider, &call[chan].sondernummer[CLIP], &call[chan].intern[CLIP], &call[chan].internetnumber[CLIP], 0, 0);
@ -2562,6 +2565,8 @@ static void decode(int chan, register char *p, int type, int version, int tei)

                          /* fall thru, and overwrite ... */
                        } /* else */
+                      } /* else */
+		    } /* else */

                    call[chan].screening = (oc3a & 3);