Permalink
Browse files

Imported Upstream version 3.12.20071127

  • Loading branch information...
1 parent 5946c1a commit 9550d24ee9b023d277c5949c6fe755919770c504 @leggewie leggewie committed Sep 14, 2010
Showing with 24 additions and 15 deletions.
  1. +2 −2 Makefile
  2. +7 −3 capi20/capi20.h
  3. +6 −2 isdnlog/isdnlog/processor.c
  4. +3 −3 isdnlog/tools/zone/de/code
  5. +4 −3 vbox/src/libvbox.h
  6. +2 −2 vbox/src/vbox.c
View
4 Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.61 2006/08/08 13:23:28 keil Exp $
+# $Id: Makefile,v 1.63 2007/11/26 13:13:44 keil Exp $
#
# Toplevel Makefile for isdn4k-utils
#
.EXPORT_ALL_VARIABLES:
-export I4LVERSION = 3.10
+export I4LVERSION = 3.12
all: do-it-all
View
10 capi20/capi20.h
@@ -1,7 +1,10 @@
/*
- * $Id: capi20.h,v 1.10 2000/04/03 14:27:15 calle Exp $
+ * $Id: capi20.h,v 1.11 2007/11/26 13:13:00 keil Exp $
*
* $Log: capi20.h,v $
+ * Revision 1.11 2007/11/26 13:13:00 keil
+ * newer gcc do not include stdlib.h by default (needed for size_t)
+ *
* Revision 1.10 2000/04/03 14:27:15 calle
* non CAPI2.0 standard functions now named capi20ext not capi20.
* Extentionfunctions will work with actual driver version.
@@ -20,12 +23,13 @@
#ifndef __CAPI20_H__
#define __CAPI20_H__
-#include <sys/time.h>
-
#ifdef __cplusplus
extern "C" {
#endif
+#include <stdlib.h>
+#include <sys/time.h>
+
/* standard CAPI2.0 functions */
unsigned capi20_register (unsigned MaxLogicalConnection,
View
8 isdnlog/isdnlog/processor.c
@@ -1,4 +1,4 @@
-/* $Id: processor.c,v 1.134 2007/01/05 04:23:58 tobiasb Exp $
+/* $Id: processor.c,v 1.135 2007/05/17 21:10:29 keil Exp $
*
* ISDN accounting for isdn4linux. (log-module)
*
@@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: processor.c,v $
+ * Revision 1.135 2007/05/17 21:10:29 keil
+ * fix compiler warnings
+ *
* Revision 1.134 2007/01/05 04:23:58 tobiasb
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
*
@@ -5570,7 +5573,8 @@ doppelt:break;
strcat(sx, " ");
strcat(sx, qmsg(TYPE_CAUSE, version, call[chan].cause));
- if (((p = location(call[chan].loc)) != "")) {
+ p = location(call[chan].loc);
+ if (p && *p) {
strcat(sx, " (");
strcat(sx, p);
strcat(sx, ")");
View
6 isdnlog/tools/zone/de/code
@@ -4352,8 +4352,8 @@
8146 Moorenweis
8151 Starnberg
8152 Herrsching a. Ammersee
-8153 Weißling
-8157 Feldafink
+8153 Weßling
+8157 Feldafing
8158 Tutzing
8161 Freising
8165 Neufahrn b.Freising
@@ -4363,7 +4363,7 @@
8170 Straßlach-Dingharting
8171 Wolfratshausen
8176 Egling
-8177 Münsing Starnbacher See
+8177 Münsing Starnberger See
8178 Icking
8179 Eurasburg a.d.Loisach
8191 Landsberg a.Lech
View
7 vbox/src/libvbox.h
@@ -1,5 +1,5 @@
/*
-** $Id: libvbox.h,v 1.8 1998/03/26 13:10:33 keil Exp $
+** $Id: libvbox.h,v 1.9 2007/05/17 15:02:43 keil Exp $
**
** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold
*/
@@ -8,6 +8,7 @@
#define _VBOX_LIBVBOX_H 1
#include <stdio.h>
+#include <asm/types.h>
/**************************************************************************/
/** VBOXD **/
@@ -116,8 +117,8 @@ extern char *compressions[];
typedef struct
{
char magic[4];
- unsigned long int time;
- unsigned long int compression;
+ __u32 time;
+ __u32 compression;
char callerid[VAH_MAX_CALLERID + 1];
char name[VAH_MAX_NAME + 1];
char phone[VAH_MAX_PHONE + 1];
View
4 vbox/src/vbox.c
@@ -1,5 +1,5 @@
/*
-** $Id: vbox.c,v 1.11 2002/01/31 20:10:20 paul Exp $
+** $Id: vbox.c,v 1.12 2007/05/17 21:10:29 keil Exp $
**
** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold
*/
@@ -261,7 +261,7 @@ int main(int argc, char **argv)
fflush(stdout);
}
- if ((!loginname) || (!*loginname) || (!loginpass) || (!*loginpass))
+ if ((*loginname == 0) || (*loginpass == 0))
{
fprintf(stderr, "%s: you must enter a login name and a password.\n", vbasename);

0 comments on commit 9550d24

Please sign in to comment.