about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--iconv/gconv_open.c2
-rw-r--r--sysdeps/posix/sysconf.c1
-rw-r--r--sysdeps/unix/bsd/getpt.c4
4 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ff6d385cce..ef9715c7f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* gconv_open (__gconv_open): Initialize whole __gconv_trans_data
+	structure.
+
+2000-07-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/posix/sysconf.c: Undef __sysconf before weak_alias.
+	* sysdeps/unix/bsd/getpt.c: Undef __getpt before weak_alias.
+
 2000-07-12  H.J. Lu  <hjl@gnu.org>
 
 	* sysdeps/unix/sysv/linux/ia64/Versions (libc): Add __clone2 to
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index cf4397eca2..bbe732c88a 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -228,6 +228,8 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 			  newp->__trans_fct = runp->trans_fct;
 			  newp->__trans_context_fct = runp->trans_context_fct;
 			  newp->__trans_end_fct = runp->trans_end_fct;
+			  newp->__data = NULL;
+			  newp->__next = NULL;
 
 			  lastp = NULL;
 			  for (endp = result->__data[cnt].__trans;
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index 0f6006cdaf..b8fd368f00 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -1091,4 +1091,5 @@ __sysconf (name)
     }
 }
 
+#undef __sysconf
 weak_alias (__sysconf, sysconf)
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index d8070972a5..42615ba159 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
 
@@ -74,4 +74,6 @@ __getpt (void)
   __set_errno (ENOENT);
   return -1;
 }
+
+#undef __getpt
 weak_alias (__getpt, getpt)