Sync intl/loadmsgcat.c with gettext
diff mbox

Message ID 532C86D8.3080203@linux.vnet.ibm.com
State New
Headers show

Commit Message

Adhemerval Zanella March 21, 2014, 6:37 p.m. UTC
Change merged from gettext.

--

	* intl/loadmsgcat.c (get_sysdep_segment_value): Use ISO C prototype.
	(_nl_load_domain): Likewise.
	(_nl_unload_domain): Likewise.

---

Comments

Roland McGrath March 21, 2014, 8:05 p.m. UTC | #1
Looks fine.  If the gettext master sources have a date or revision stamp
that you can refer to in the log entry to make explicit in the future what
historical gettext state was merged today, that would be best.

Patch
diff mbox

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 3b9ceec..12ae1dd 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -487,8 +487,7 @@  int _nl_msg_cat_cntr;
 
 /* Expand a system dependent string segment.  Return NULL if unsupported.  */
 static const char *
-get_sysdep_segment_value (name)
-     const char *name;
+get_sysdep_segment_value (const char *name)
 {
   /* Test for an ISO C 99 section 7.8.1 format string directive.
      Syntax:
@@ -757,9 +756,8 @@  get_sysdep_segment_value (name)
    message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
+_nl_load_domain (struct loaded_l10nfile *domain_file,
+		 struct binding *domainbinding)
 {
   __libc_lock_define_initialized_recursive (static, lock);
   int fd = -1;
@@ -822,7 +820,7 @@  _nl_load_domain (domain_file, domainbinding)
       || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
       || __builtin_expect (size < sizeof (struct mo_file_header), 0))
     /* Something went wrong.  */
-    goto out;;
+    goto out;
 
 #ifdef HAVE_MMAP
   /* Now we are ready to load the file.  If mmap() is available we try
@@ -1278,8 +1276,7 @@  _nl_load_domain (domain_file, domainbinding)
 #ifdef _LIBC
 void
 internal_function __libc_freeres_fn_section
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
+_nl_unload_domain (struct loaded_domain *domain)
 {
   size_t i;