aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog31
-rw-r--r--elf/Makefile3
-rw-r--r--elf/constload2.c2
-rw-r--r--elf/dep1.c1
-rw-r--r--elf/dep2.c1
-rw-r--r--elf/dep3.c2
-rw-r--r--elf/dep4.c1
-rw-r--r--elf/ltglobmod2.c1
-rw-r--r--elf/preloadtest.c3
-rw-r--r--elf/testobj.h28
-rw-r--r--elf/testobj1.c2
-rw-r--r--elf/testobj1_1.c2
-rw-r--r--elf/testobj2.c2
-rw-r--r--elf/testobj3.c3
-rw-r--r--elf/testobj4.c2
-rw-r--r--elf/testobj5.c3
-rw-r--r--elf/testobj6.c2
-rw-r--r--libio/fmemopen.c8
-rw-r--r--stdio-common/scanf9.c31
-rw-r--r--stdio-common/tst-printf.c16
-rw-r--r--stdio-common/tstdiomisc.c6
21 files changed, 113 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog
index c06aeff89b..ab94b136b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2000-12-15 Andreas Jaeger <aj@suse.de>
+
+ * stdio-common/scanf9.c (main): Reformat and change to avoid
+ warnings.
+
+ * stdio-common/tstdiomisc.c: Make local functions static.
+ * stdio-common/tst-printf.c: Likewise.
+
+ * elf/constload2.c: Add prototype declarations to shut up gcc.
+ * elf/dep1.c: Likewise.
+ * elf/dep2.c: Likewise.
+ * elf/dep3.c: Likewise.
+ * elf/dep4.c: Likewise.
+ * elf/ltglobmod2.c: Likewise.
+
+ * libio/fmemopen.c: Make local functions static.
+
+ * elf/Makefile (distribute): Added testobj.h.
+
+ * elf/testobj.h: New file.
+
+ * elf/testobj1.c: Include testobj.h and move prototype
+ declarations to testobj.h.
+ * elf/testobj2.c: Likewise.
+ * elf/testobj3.c: Likewise.
+ * elf/testobj4.c: Likewise.
+ * elf/testobj5.c: Likewise.
+ * elf/testobj6.c: Likewise.
+ * elf/testobj1_1.c: Likewise.
+ * elf/preloadtest.c: Likewise.
+
2000-12-15 Ben Collins <bcollins@debian.org>
* misc/sys/cdefs.h: Fix thinko in checks for flexarr macros.
diff --git a/elf/Makefile b/elf/Makefile
index cb8777b7f0..830499366f 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -55,7 +55,8 @@ distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
reldepmod1.c reldepmod2.c reldepmod3.c reldepmod4.c \
nextmod1.c nextmod2.c pathoptobj.c tst-pathopt.sh \
neededobj1.c neededobj2.c neededobj3.c neededobj4.c \
- unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c
+ unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c \
+ testobj.h
include ../Makeconfig
diff --git a/elf/constload2.c b/elf/constload2.c
index d20e6dcbb8..b665036c16 100644
--- a/elf/constload2.c
+++ b/elf/constload2.c
@@ -3,6 +3,8 @@
#include <stdlib.h>
extern int bar (void);
+extern int baz (void);
+extern int foo (void);
void *h;
diff --git a/elf/dep1.c b/elf/dep1.c
index 49dc2a22d9..7ef47adb43 100644
--- a/elf/dep1.c
+++ b/elf/dep1.c
@@ -1,5 +1,6 @@
#include <unistd.h>
+extern int dep1 (void);
extern int dep2 (void);
extern int dep4 (void);
diff --git a/elf/dep2.c b/elf/dep2.c
index 9dc5cfcf55..749036a4ec 100644
--- a/elf/dep2.c
+++ b/elf/dep2.c
@@ -1,5 +1,6 @@
#include <unistd.h>
+extern int dep2 (void);
extern int dep3 (void);
extern int dep4 (void);
diff --git a/elf/dep3.c b/elf/dep3.c
index ec7c7d36d7..3df6282009 100644
--- a/elf/dep3.c
+++ b/elf/dep3.c
@@ -1,5 +1,7 @@
#include <unistd.h>
+extern int dep3 (void);
+
static void
__attribute__ ((constructor))
init (void)
diff --git a/elf/dep4.c b/elf/dep4.c
index 9aad67d659..c496d6f531 100644
--- a/elf/dep4.c
+++ b/elf/dep4.c
@@ -1,6 +1,7 @@
#include <unistd.h>
extern int dep3 (void);
+extern int dep4 (void);
static void
__attribute__ ((constructor))
diff --git a/elf/ltglobmod2.c b/elf/ltglobmod2.c
index bc1cd27c40..33f14cc980 100644
--- a/elf/ltglobmod2.c
+++ b/elf/ltglobmod2.c
@@ -3,6 +3,7 @@
#include <stdlib.h>
extern int bar (void);
+extern int foo (void);
int
foo (void)
diff --git a/elf/preloadtest.c b/elf/preloadtest.c
index 9edc87a7bc..7ea10b9b5b 100644
--- a/elf/preloadtest.c
+++ b/elf/preloadtest.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-extern int preload (int);
+#include "testobj.h"
int
main (void)
@@ -12,7 +12,6 @@ main (void)
return res != 92;
}
-extern int foo (int a);
int
foo (int a)
{
diff --git a/elf/testobj.h b/elf/testobj.h
new file mode 100644
index 0000000000..12f18effcc
--- /dev/null
+++ b/elf/testobj.h
@@ -0,0 +1,28 @@
+extern int preload (int a);
+
+extern int foo (int);
+
+extern int obj1func1 (int);
+
+extern int obj1func2 (int);
+
+extern int obj2func1 (int);
+
+extern int obj2func2 (int);
+
+extern int obj3func1 (int);
+
+extern int obj3func2 (int);
+
+extern int obj4func1 (int);
+
+extern int obj4func2 (int);
+
+extern int obj5func1 (int);
+
+extern int obj5func2 (int);
+
+extern int obj6func1 (int);
+
+extern int obj6func2 (int);
+
diff --git a/elf/testobj1.c b/elf/testobj1.c
index d5b485f1ed..5ab20efd62 100644
--- a/elf/testobj1.c
+++ b/elf/testobj1.c
@@ -1,7 +1,7 @@
#include <dlfcn.h>
#include <stdlib.h>
-extern int foo (int);
+#include "testobj.h"
int
obj1func1 (int a __attribute__ ((unused)))
diff --git a/elf/testobj1_1.c b/elf/testobj1_1.c
index a146067872..2541a5ad1b 100644
--- a/elf/testobj1_1.c
+++ b/elf/testobj1_1.c
@@ -1,4 +1,4 @@
-extern int obj1func2 (int);
+#include "testobj.h"
int
obj1func1 (int a)
diff --git a/elf/testobj2.c b/elf/testobj2.c
index b9c2ca8fcc..6514c56393 100644
--- a/elf/testobj2.c
+++ b/elf/testobj2.c
@@ -1,7 +1,7 @@
#include <dlfcn.h>
#include <stdlib.h>
-extern int obj1func1 (int);
+#include "testobj.h"
int
obj2func1 (int a __attribute__ ((unused)))
diff --git a/elf/testobj3.c b/elf/testobj3.c
index d8ede36916..c025ff631a 100644
--- a/elf/testobj3.c
+++ b/elf/testobj3.c
@@ -1,7 +1,8 @@
#include <dlfcn.h>
#include <stdlib.h>
-extern int foo (int);
+#include "testobj.h"
+
int
obj3func1 (int a __attribute__ ((unused)))
diff --git a/elf/testobj4.c b/elf/testobj4.c
index a354f76a31..2729ba32be 100644
--- a/elf/testobj4.c
+++ b/elf/testobj4.c
@@ -1,7 +1,7 @@
#include <dlfcn.h>
#include <stdlib.h>
-extern int foo (int);
+#include "testobj.h"
int
obj4func1 (int a __attribute__ ((unused)))
diff --git a/elf/testobj5.c b/elf/testobj5.c
index af36aa9b1d..9675cad88d 100644
--- a/elf/testobj5.c
+++ b/elf/testobj5.c
@@ -1,7 +1,8 @@
#include <dlfcn.h>
#include <stdlib.h>
-extern int foo (int);
+#include "testobj.h"
+
int
obj5func1 (int a __attribute__ ((unused)))
diff --git a/elf/testobj6.c b/elf/testobj6.c
index ab9c4b9325..fcba01631d 100644
--- a/elf/testobj6.c
+++ b/elf/testobj6.c
@@ -1,4 +1,4 @@
-extern int foo (int);
+#include "testobj.h"
int
obj6func1 (int a __attribute__ ((unused)))
diff --git a/libio/fmemopen.c b/libio/fmemopen.c
index 99670b5c58..a1ad6d8884 100644
--- a/libio/fmemopen.c
+++ b/libio/fmemopen.c
@@ -87,7 +87,7 @@ struct fmemopen_cookie_struct
};
-ssize_t
+static ssize_t
fmemopen_read (void *cookie, char *b, size_t s)
{
fmemopen_cookie_t *c;
@@ -111,7 +111,7 @@ fmemopen_read (void *cookie, char *b, size_t s)
}
-ssize_t
+static ssize_t
fmemopen_write (void *cookie, const char *b, size_t s)
{
fmemopen_cookie_t *c;
@@ -145,7 +145,7 @@ fmemopen_write (void *cookie, const char *b, size_t s)
}
-int
+static int
fmemopen_seek (void *cookie, _IO_off64_t *p, int w)
{
_IO_off64_t np;
@@ -180,7 +180,7 @@ fmemopen_seek (void *cookie, _IO_off64_t *p, int w)
}
-int
+static int
fmemopen_close (void *cookie)
{
fmemopen_cookie_t *c;
diff --git a/stdio-common/scanf9.c b/stdio-common/scanf9.c
index 52bff08e18..7aca354d2a 100644
--- a/stdio-common/scanf9.c
+++ b/stdio-common/scanf9.c
@@ -2,22 +2,29 @@
#include <stdlib.h>
#include <string.h>
-int main(int argc, char *argv[]) {
- int matches;
- char str[10];
+int
+main (void)
+{
+ int matches;
+ char str[10];
str[0] = '\0';
matches = -9;
- matches = sscanf("x ]", "%[^] ]", str);
- printf("Matches = %d, string str = \"%s\".\n", matches, str);
- printf("str should be \"x\".\n");
- if (strcmp (str, "x")) abort ();
+ matches = sscanf ("x ]", "%[^] ]", str);
+ printf ("Matches = %d, string str = \"%s\".\n", matches, str);
+ printf ("str should be \"x\".\n");
+
+ if (strcmp (str, "x"))
+ abort ();
+
str[0] = '\0';
matches = -9;
- matches = sscanf(" ] x", "%[] ]", str);
- printf("Matches = %d, string str = \"%s\".\n", matches, str);
- printf("str should be \" ] \".\n");
- if (strcmp (str, " ] ")) abort ();
- exit(0);
+ matches = sscanf (" ] x", "%[] ]", str);
+ printf ("Matches = %d, string str = \"%s\".\n", matches, str);
+ printf ("str should be \" ] \".\n");
+
+ if (strcmp (str, " ] "))
+ abort ();
+
return 0;
}
diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c
index f0f0e55bc4..7a99efc6c9 100644
--- a/stdio-common/tst-printf.c
+++ b/stdio-common/tst-printf.c
@@ -28,11 +28,11 @@
#include <float.h>
-void rfg1 (void);
-void rfg2 (void);
+static void rfg1 (void);
+static void rfg2 (void);
-void
+static void
fmtchk (const char *fmt)
{
(void) fputs(fmt, stdout);
@@ -41,7 +41,7 @@ fmtchk (const char *fmt)
(void) printf("'\n");
}
-void
+static void
fmtst1chk (const char *fmt)
{
(void) fputs(fmt, stdout);
@@ -50,7 +50,7 @@ fmtst1chk (const char *fmt)
(void) printf("'\n");
}
-void
+static void
fmtst2chk (const char *fmt)
{
(void) fputs(fmt, stdout);
@@ -82,7 +82,7 @@ fmtst2chk (const char *fmt)
* This exercises the output formatting code.
*/
-void
+static void
fp_test (void)
{
int i, j, k, l;
@@ -292,7 +292,7 @@ I am ready for my first lesson today.";
return result != 0;
}
-void
+static void
rfg1 (void)
{
char buf[100];
@@ -317,7 +317,7 @@ rfg1 (void)
printf ("got: '%s', expected: '%s'\n", buf, "3E+01");
}
-void
+static void
rfg2 (void)
{
int prec;
diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c
index 55d77b0f29..452a21f9cb 100644
--- a/stdio-common/tstdiomisc.c
+++ b/stdio-common/tstdiomisc.c
@@ -4,7 +4,7 @@
#include <string.h>
#include <wchar.h>
-int
+static int
t1 (void)
{
int n = -1;
@@ -14,7 +14,7 @@ t1 (void)
return n != 5;
}
-int
+static int
t2 (void)
{
int result = 0;
@@ -46,7 +46,7 @@ t2 (void)
return result;
}
-int
+static int
F (void)
{
char buf[20];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 06:07:42 +0000