Minor fixes, required by gcc-3.4: Label at end of block, double function

declaration.  Revealed by Andreas Jochens as Debian bug #266523.

eicon/divautil/linload.c

@@ -197,7 +197,7 @@ int DivaALoad (char *dsp_name,
 			case 6:
 				filename[strlen(filename)-1]='6';
 				break;
-			default:
+			default: ;
 		}
 	}
 

isdnlog/isdnlog/ChangeLog

@@ -1,3 +1,8 @@
+2004-08-25  Tobias Becker  <tobiasb@isdn4linux.de>
+
+	* processor.c (processctrl): Removed declaration of moreinfo, it is
+	declared in isdnlog.h.
+
 2004-07-24  Tobias Becker  <tobiasb@isdn4linux.de>
 
 	* start_prog.c (Get_Opts): The call duration \$5 is now 0 until

isdnlog/isdnlog/processor.c

@@ -1,4 +1,4 @@
-/* $Id: processor.c,v 1.127 2003/10/29 17:41:34 tobiasb Exp $
+/* $Id: processor.c,v 1.128 2004/08/25 21:22:06 tobiasb 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.128  2004/08/25 21:22:06  tobiasb
+ * Minor fixes, required by gcc-3.4: Label at end of block, double function
+ * declaration.  Revealed by Andreas Jochens as Debian bug #266523.
+ *
  * Revision 1.127  2003/10/29 17:41:34  tobiasb
  * isdnlog-4.67:
  *  - Enhancements for isdnrep:
@@ -5564,7 +5568,6 @@ endhex:
     tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */
 
     if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */
-      static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */
       moreinfo();
     } /* if */
 

isdnlog/tools/ChangeLog

@@ -1,3 +1,8 @@
+2004-08-25  Tobias Becker  <tobiasb@isdn4linux.de>
+
+	* rate.c (initRate, get_area1): Put a minimal statement after label
+	at end of block.
+
 2004-07-24  Tobias Becker  <tobiasb@isdn4linux.de>
 
 	* isdnconf.c (Set_Globals): Store `REPOTIONS' config file entry to

isdnlog/tools/cdb/ChangeLog

@@ -0,0 +1,5 @@
+2004-08-25  Tobias Becker  <tobiasb@isdn4linux.de>
+
+	* cdbmake.c: Removed declaration of malloc, declared in stdlib.h.
+
+	* ChangeLog: Started this file.

isdnlog/tools/cdb/cdbmake.c

@@ -3,8 +3,6 @@
 #include "freecdbmake.h"
 #include <unistd.h>
 
-extern char *malloc();
-
 void diesys(why) char *why; { perror(why); exit(111); }
 
 void writeerror() { diesys("cdbmake: fatal: unable to write"); }

isdnlog/tools/rate.c

@@ -1,6 +1,6 @@
 /* #define DEBUG_REDIRZ */
 
-/* $Id: rate.c,v 1.87 2004/01/11 15:16:11 tobiasb Exp $
+/* $Id: rate.c,v 1.88 2004/08/25 21:22:07 tobiasb Exp $
  *
  * Tarifdatenbank
  *
@@ -21,6 +21,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log: rate.c,v $
+ * Revision 1.88  2004/08/25 21:22:07  tobiasb
+ * Minor fixes, required by gcc-3.4: Label at end of block, double function
+ * declaration.  Revealed by Andreas Jochens as Debian bug #266523.
+ *
  * Revision 1.87  2004/01/11 15:16:11  tobiasb
  * Do not ignore last provider in ratefile if it contains only redirs (R:)
  * and no real zones (Z:).
@@ -1817,7 +1821,7 @@ again:
 	  numbers++;
 	  number=realloc(number, numbers*sizeof(int));
 	  number[numbers-1]=i;
-	skip:
+	skip: ;
 	}
 
 	while (isblank(*s)) s++;
@@ -2390,7 +2394,7 @@ static int get_area1(int prefix, RATE *Rate, char *number, TELNUM *num,
 	  }
 	}
 	return UNKNOWN;
-      done:
+      done: ;
       }
     }
   }

lib/libtools.c

@@ -1,4 +1,4 @@
-/* $Id: libtools.c,v 1.10 1999/11/03 16:13:36 paul Exp $
+/* $Id: libtools.c,v 1.11 2004/08/25 21:22:14 tobiasb Exp $
  * ISDN accounting for isdn4linux.
  *
  * Copyright 1996 by Stefan Luethje (luethje@sl-gw.lake.de)
@@ -18,6 +18,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log: libtools.c,v $
+ * Revision 1.11  2004/08/25 21:22:14  tobiasb
+ * Minor fixes, required by gcc-3.4: Label at end of block, double function
+ * declaration.  Revealed by Andreas Jochens as Debian bug #266523.
+ *
  * Revision 1.10  1999/11/03 16:13:36  paul
  * Added { } to suppress egcs warnings.
  *
@@ -710,7 +714,7 @@ const char *Pathfind(const char *path, const char *name, char *mode)
 				          break;
 				case 'r': _mode |= R_OK;
 				          break;
-				default :
+				default : ;
 			}
 		}