summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd-line-utils/libedit/chared.c7
-rw-r--r--cmd-line-utils/libedit/common.c7
-rw-r--r--cmd-line-utils/libedit/el.c7
-rw-r--r--cmd-line-utils/libedit/emacs.c7
-rw-r--r--cmd-line-utils/libedit/fgetln.c5
-rw-r--r--cmd-line-utils/libedit/hist.c7
-rw-r--r--cmd-line-utils/libedit/history.c7
-rw-r--r--cmd-line-utils/libedit/key.c7
-rw-r--r--cmd-line-utils/libedit/map.c7
-rw-r--r--cmd-line-utils/libedit/parse.c7
-rw-r--r--cmd-line-utils/libedit/prompt.c7
-rw-r--r--cmd-line-utils/libedit/read.c7
-rw-r--r--cmd-line-utils/libedit/readline.c4
-rw-r--r--cmd-line-utils/libedit/refresh.c7
-rw-r--r--cmd-line-utils/libedit/search.c7
-rw-r--r--cmd-line-utils/libedit/sig.c7
-rw-r--r--cmd-line-utils/libedit/term.c7
-rw-r--r--cmd-line-utils/libedit/tokenizer.c7
-rw-r--r--cmd-line-utils/libedit/tty.c7
-rw-r--r--cmd-line-utils/libedit/vi.c7
-rw-r--r--mysys/Makefile.am2
-rw-r--r--tests/client_test.c2
22 files changed, 5 insertions, 134 deletions
diff --git a/cmd-line-utils/libedit/chared.c b/cmd-line-utils/libedit/chared.c
index 1579ad66abf..6ac051c3bb0 100644
--- 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
diff --git a/cmd-line-utils/libedit/common.c b/cmd-line-utils/libedit/common.c
index ca72e14150e..9ac6af9ac1b 100644
--- 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
diff --git a/cmd-line-utils/libedit/el.c b/cmd-line-utils/libedit/el.c
index 73d94c53899..d436d113419 100644
--- 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
diff --git a/cmd-line-utils/libedit/emacs.c b/cmd-line-utils/libedit/emacs.c
index 239b7da2f77..bb5ffb2a9f6 100644
--- 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
diff --git a/cmd-line-utils/libedit/fgetln.c b/cmd-line-utils/libedit/fgetln.c
index 532354c1158..9804866147f 100644
--- 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;
}
diff --git a/cmd-line-utils/libedit/hist.c b/cmd-line-utils/libedit/hist.c
index ec47a35343e..2b20c7d14dc 100644
--- 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
diff --git a/cmd-line-utils/libedit/history.c b/cmd-line-utils/libedit/history.c
index 5c129dcbb21..90d94e7fc18 100644
--- 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
diff --git a/cmd-line-utils/libedit/key.c b/cmd-line-utils/libedit/key.c
index f349f9f8588..629c6aeeb9c 100644
--- 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
diff --git a/cmd-line-utils/libedit/map.c b/cmd-line-utils/libedit/map.c
index fa5a80fbf0b..144ccf1ebe0 100644
--- 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
diff --git a/cmd-line-utils/libedit/parse.c b/cmd-line-utils/libedit/parse.c
index 5e97dd2ee1c..b6d077793af 100644
--- 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
diff --git a/cmd-line-utils/libedit/prompt.c b/cmd-line-utils/libedit/prompt.c
index 4e8e4fa2082..fb7d9d35936 100644
--- 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
diff --git a/cmd-line-utils/libedit/read.c b/cmd-line-utils/libedit/read.c
index d0c4671f1f8..05f9e3da454 100644
--- 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.
diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c
index 5e8a9a8132f..e9c8409102c 100644
--- 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>
diff --git a/cmd-line-utils/libedit/refresh.c b/cmd-line-utils/libedit/refresh.c
index dbdd4961b2d..534e7e12304 100644
--- 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
diff --git a/cmd-line-utils/libedit/search.c b/cmd-line-utils/libedit/search.c
index b082235224d..bdc3a1e8bb9 100644
--- 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
diff --git a/cmd-line-utils/libedit/sig.c b/cmd-line-utils/libedit/sig.c
index b50e9d64445..19408a0a8f2 100644
--- 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.
diff --git a/cmd-line-utils/libedit/term.c b/cmd-line-utils/libedit/term.c
index 3fa706919c1..df8d1ea67cc 100644
--- 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
diff --git a/cmd-line-utils/libedit/tokenizer.c b/cmd-line-utils/libedit/tokenizer.c
index bc82e82a796..7a7e5b5ed75 100644
--- 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
diff --git a/cmd-line-utils/libedit/tty.c b/cmd-line-utils/libedit/tty.c
index 1e08fc37fa1..2c7b502136d 100644
--- 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
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c
index 5794576f8fd..296e11eb4d9 100644
--- 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.
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index b93ddd2241d..97eb06c7aa7 100644
--- 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)\"" \
diff --git a/tests/client_test.c b/tests/client_test.c
index 6f7473cf4b5..44205d04561 100644
--- 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);
View Lorry Controller Status