Removed compiler warnings

cmd-line-utils/libedit/chared.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/common.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/el.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/emacs.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/fgetln.c: Removed RCSID to get rid of compiler warnings Removed compiler warning cmd-line-utils/libedit/hist.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/history.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/key.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/map.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/parse.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/prompt.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/read.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/readline.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/refresh.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/search.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/sig.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/term.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/tokenizer.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/tty.c: Removed RCSID to get rid of compiler warnings cmd-line-utils/libedit/vi.c: Removed RCSID to get rid of compiler warnings mysys/Makefile.am: Remove library dependency for charset2html to get correct makefile tests/client_test.c: Indentation change
2003-01-19 02:24:02 +02:00 · 2003-01-19 02:24:02 +02:00 · 388e7f94cf
commit 388e7f94cf
parent 663e79c44b
22 changed files with 5 additions and 134 deletions
--- a/cmd-line-utils/libedit/chared.c
+++ b/cmd-line-utils/libedit/chared.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: chared.c,v 1.14 2001/05/17 01:02:17 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * chared.c: Character editor utilities
--- a/cmd-line-utils/libedit/common.c
+++ b/cmd-line-utils/libedit/common.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: common.c,v 1.10 2001/01/10 07:45:41 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * common.c: Common Editor functions
--- a/cmd-line-utils/libedit/el.c
+++ b/cmd-line-utils/libedit/el.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
-#else
-__RCSID("$NetBSD: el.c,v 1.21 2001/01/05 22:45:30 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * el.c: EditLine interface functions
--- a/cmd-line-utils/libedit/emacs.c
+++ b/cmd-line-utils/libedit/emacs.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: emacs.c,v 1.9 2001/01/10 07:45:41 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * emacs.c: Emacs functions
--- a/cmd-line-utils/libedit/fgetln.c
+++ b/cmd-line-utils/libedit/fgetln.c
@ -95,9 +95,10 @@ getline (char **lineptr, size_t *n, FILE *stream)
 char *fgetln(FILE *stream, size_t *len)
 {
  char *ptr = NULL;
-  int sz = 0;
+  int sz;
+  size_t length= 0;

-  sz = getline(&ptr,  &sz, stream);
+  sz = getline(&ptr,  &length, stream);
  if(len) {
    *len = sz;
  }
--- a/cmd-line-utils/libedit/hist.c
+++ b/cmd-line-utils/libedit/hist.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: hist.c,v 1.9 2001/05/17 01:02:17 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * hist.c: History access functions
--- a/cmd-line-utils/libedit/history.c
+++ b/cmd-line-utils/libedit/history.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: history.c,v 1.17 2001/03/20 00:08:31 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * hist.c: History access functions
--- a/cmd-line-utils/libedit/key.c
+++ b/cmd-line-utils/libedit/key.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: key.c,v 1.12 2001/05/17 01:02:17 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * key.c: This module contains the procedures for maintaining
--- a/cmd-line-utils/libedit/map.c
+++ b/cmd-line-utils/libedit/map.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: map.c,v 1.14 2001/01/09 17:22:09 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * map.c: Editor function definitions
--- a/cmd-line-utils/libedit/parse.c
+++ b/cmd-line-utils/libedit/parse.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: parse.c,v 1.14 2001/01/23 15:55:30 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * parse.c: parse an editline extended command
--- a/cmd-line-utils/libedit/prompt.c
+++ b/cmd-line-utils/libedit/prompt.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: prompt.c,v 1.8 2001/01/10 07:45:41 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * prompt.c: Prompt printing functions
--- a/cmd-line-utils/libedit/read.c
+++ b/cmd-line-utils/libedit/read.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: read.c,v 1.19 2001/01/10 07:45:41 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * read.c: Clean this junk up! This is horrible code.
--- a/cmd-line-utils/libedit/readline.c
+++ b/cmd-line-utils/libedit/readline.c
@ -37,10 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.19 2001/01/10 08:10:45 jdolecek Exp $");
-#endif /* not lint && not SCCSID */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
--- a/cmd-line-utils/libedit/refresh.c
+++ b/cmd-line-utils/libedit/refresh.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: refresh.c,v 1.17 2001/04/13 00:53:11 lukem Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * refresh.c: Lower level screen refreshing functions
--- a/cmd-line-utils/libedit/search.c
+++ b/cmd-line-utils/libedit/search.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: search.c,v 1.11 2001/01/23 15:55:31 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * search.c: History and character search functions
--- a/cmd-line-utils/libedit/sig.c
+++ b/cmd-line-utils/libedit/sig.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: sig.c,v 1.8 2001/01/09 17:31:04 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * sig.c: Signal handling stuff.
--- a/cmd-line-utils/libedit/term.c
+++ b/cmd-line-utils/libedit/term.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
-#else
-__RCSID("$NetBSD: term.c,v 1.32 2001/01/23 15:55:31 jdolecek Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * term.c: Editor/termcap-curses interface
--- a/cmd-line-utils/libedit/tokenizer.c
+++ b/cmd-line-utils/libedit/tokenizer.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tokenizer.c,v 1.7 2001/01/04 15:56:32 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * tokenize.c: Bourne shell like tokenizer
--- a/cmd-line-utils/libedit/tty.c
+++ b/cmd-line-utils/libedit/tty.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tty.c,v 1.15 2001/05/17 01:02:17 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * tty.c: tty interface stuff
--- a/cmd-line-utils/libedit/vi.c
+++ b/cmd-line-utils/libedit/vi.c
@ -37,13 +37,6 @@
 */

 #include "compat.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vi.c,v 1.8 2000/09/04 22:06:33 lukem Exp $");
-#endif
-#endif /* not lint && not SCCSID */

 /*
 * vi.c: Vi mode commands.
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@ -60,7 +60,7 @@ noinst_PROGRAMS =	charset2html @THREAD_LPROGRAMS@
 # test_dir_DEPENDENCIES=	$(LIBRARIES)
 # testhash_DEPENDENCIES=	$(LIBRARIES)
 # test_charset_DEPENDENCIES=	$(LIBRARIES)
-charset2html_DEPENDENCIES=	$(LIBRARIES)
+# charset2html_DEPENDENCIES=	$(LIBRARIES)
 EXTRA_PROGRAMS =	
 DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
--- a/tests/client_test.c
+++ b/tests/client_test.c
@ -163,7 +163,7 @@ static void client_connect()
  char buff[255];
  myheader("client_connect");  

-  if(!(mysql = mysql_init(NULL)))
+  if (!(mysql = mysql_init(NULL)))
  { 
 	  myerror("mysql_init() failed");
    exit(0);