mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 06:10:06 +00:00
Update.
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.
This commit is contained in:
parent
8ab5926a26
commit
1a511d3105
31
ChangeLog
31
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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -3,6 +3,8 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int bar (void);
|
||||
extern int baz (void);
|
||||
extern int foo (void);
|
||||
|
||||
void *h;
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include <unistd.h>
|
||||
|
||||
extern int dep1 (void);
|
||||
extern int dep2 (void);
|
||||
extern int dep4 (void);
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include <unistd.h>
|
||||
|
||||
extern int dep2 (void);
|
||||
extern int dep3 (void);
|
||||
extern int dep4 (void);
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
extern int dep3 (void);
|
||||
|
||||
static void
|
||||
__attribute__ ((constructor))
|
||||
init (void)
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
extern int dep3 (void);
|
||||
extern int dep4 (void);
|
||||
|
||||
static void
|
||||
__attribute__ ((constructor))
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int bar (void);
|
||||
extern int foo (void);
|
||||
|
||||
int
|
||||
foo (void)
|
||||
|
@ -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)
|
||||
{
|
||||
|
28
elf/testobj.h
Normal file
28
elf/testobj.h
Normal file
@ -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);
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <dlfcn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int foo (int);
|
||||
#include "testobj.h"
|
||||
|
||||
int
|
||||
obj1func1 (int a __attribute__ ((unused)))
|
||||
|
@ -1,4 +1,4 @@
|
||||
extern int obj1func2 (int);
|
||||
#include "testobj.h"
|
||||
|
||||
int
|
||||
obj1func1 (int a)
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <dlfcn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int obj1func1 (int);
|
||||
#include "testobj.h"
|
||||
|
||||
int
|
||||
obj2func1 (int a __attribute__ ((unused)))
|
||||
|
@ -1,7 +1,8 @@
|
||||
#include <dlfcn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int foo (int);
|
||||
#include "testobj.h"
|
||||
|
||||
|
||||
int
|
||||
obj3func1 (int a __attribute__ ((unused)))
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <dlfcn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int foo (int);
|
||||
#include "testobj.h"
|
||||
|
||||
int
|
||||
obj4func1 (int a __attribute__ ((unused)))
|
||||
|
@ -1,7 +1,8 @@
|
||||
#include <dlfcn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int foo (int);
|
||||
#include "testobj.h"
|
||||
|
||||
|
||||
int
|
||||
obj5func1 (int a __attribute__ ((unused)))
|
||||
|
@ -1,4 +1,4 @@
|
||||
extern int foo (int);
|
||||
#include "testobj.h"
|
||||
|
||||
int
|
||||
obj6func1 (int a __attribute__ ((unused)))
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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];
|
||||
|
Loading…
Reference in New Issue
Block a user