[glibc] Allow fill_archive to be called with NULL fname.

Carlos O'Donell codonell at fedoraproject.org
Sat Oct 19 03:39:07 UTC 2013


commit f6520166f41d58832351d35cfa987ecbb44f5986
Author: Carlos O'Donell <carlos at redhat.com>
Date:   Fri Oct 18 23:27:45 2013 -0400

    Allow fill_archive to be called with NULL fname.
    
    The fill_archive function should support being
    called with a NULL fname argument. A NULL fname
    argument indicates that the default archive should
    be opened. We enable this by setting ah.fname to
    NULL before initializing ah or calling open_archive.
    This way if fname is NULL then ah.fname remains NULL
    and open_archive opens the default archive.

 build-locale-archive.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/build-locale-archive.c b/build-locale-archive.c
index 0c218b9..9715afd 100644
--- a/build-locale-archive.c
+++ b/build-locale-archive.c
@@ -311,6 +311,7 @@ fill_archive (struct locarhandle *tmpl_ah,
 
   /* Open the archive.  This call never returns if we cannot
      successfully open the archive.  */
+  ah.fname = NULL;
   if (fname != NULL)
     ah.fname = fname;
   open_archive (&ah, false);


More information about the scm-commits mailing list