Deprecate external use of libio.h and _G_config.h.

[thirdparty/glibc.git] / stdio-common / xbug.c

diff --git a/stdio-common/xbug.c b/stdio-common/xbug.c
index 7ab76f051afe4533c187a500955038f4328c388d..06f74aff005927f35df392da8a8fdb4c27c57407 100644 (file)
--- a/stdio-common/xbug.c
+++ b/stdio-common/xbug.c
@@ -8,26 +8,22 @@ typedef struct _Buffer {
   int  room, used;
 } Buffer;
 
-#if __STDC__ - 0
 void InitBuffer (Buffer *b);
-void AppendToBuffer (register Buffer *b, const char *str, register int len);
-void ReadFile (register Buffer *buffer, FILE *input);
-#endif
+void AppendToBuffer (Buffer *b, const char *str, int len);
+void ReadFile (Buffer *buffer, FILE *input);
 
 #define INIT_BUFFER_SIZE 10000
 
-void InitBuffer(b)
-     Buffer *b;
+void
+InitBuffer (Buffer *b)
 {
   b->room = INIT_BUFFER_SIZE;
   b->used = 0;
   b->buff = (char *)malloc(INIT_BUFFER_SIZE*sizeof(char));
 }
 
-void AppendToBuffer(b, str, len)
-     register Buffer *b;
-     const char *str;
-     register int len;
+void
+AppendToBuffer (Buffer *b, const char *str, int len)
 {
   while (b->used + len > b->room) {
     b->buff = (char *)realloc(b->buff, 2*b->room*(sizeof(char)));
@@ -37,12 +33,11 @@ void AppendToBuffer(b, str, len)
   b->used += len;
 }
 
-void ReadFile(buffer, input)
-     register Buffer *buffer;
-     FILE *input;
+void
+ReadFile (Buffer *buffer, FILE *input)
 {
   char       buf[BUFSIZ + 1];
-  register int        bytes;
+  int        bytes;
 
   buffer->used = 0;
   while (!feof(input) && (bytes = fread(buf, 1, BUFSIZ, input)) > 0) {
@@ -63,6 +58,8 @@ main(int argc, char *argv[])
   if (!freopen (filename, "r", stdin))
     fprintf(stderr, "cannot open file\n");
 
+  unsetenv ("LD_LIBRARY_PATH");
+
   if (!(input = popen("/bin/cat", "r")))
     fprintf(stderr, "cannot run \n");