[svn] gpg-error - r174 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2006-07-04 13:55:00 +0200 (Tue, 04 Jul 2006)
New Revision: 174

Modified:
   trunk/ChangeLog
   trunk/src/gpg-error.c
   trunk/src/init.c
Log:
2006-07-04  Marcus Brinkmann  <marcus at g10code.de>

	* src/init.c (get_locale_dir): Return NULL instead of garbage.
	* src/gpg-error.c (get_locale_dir): Likewise.
	Submitted by Simon Josefsson <jas at extundo.com>.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-05-30 16:07:59 UTC (rev 173)
+++ trunk/ChangeLog	2006-07-04 11:55:00 UTC (rev 174)
@@ -1,3 +1,9 @@
+2006-07-04  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/init.c (get_locale_dir): Return NULL instead of garbage.
+	* src/gpg-error.c (get_locale_dir): Likewise.
+	Reported by Simon Josefsson <jas at extundo.com>.
+
 2006-05-30  Marcus Brinkmann  <marcus at g10code.de>
 
 	* lang/cl/gpg-error.asd.in (gpg-error): Add "depends-on" on cffi.

Modified: trunk/src/gpg-error.c
===================================================================
--- trunk/src/gpg-error.c	2006-05-30 16:07:59 UTC (rev 173)
+++ trunk/src/gpg-error.c	2006-07-04 11:55:00 UTC (rev 174)
@@ -215,7 +215,7 @@
   instdir = read_w32_registry_string ("HKEY_LOCAL_MACHINE", REGKEY,
 				      "Install Directory");
   if (!instdir)
-    return;
+    return NULL;
   
   /* Build the key: "<instdir>/share/locale".  */
 #define SLDIR "\\share\\locale"
@@ -223,7 +223,7 @@
   if (!dname)
     {
       free (instdir);
-      return;
+      return NULL;
     }
   p = dname;
   strcpy (p, instdir);

Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c	2006-05-30 16:07:59 UTC (rev 173)
+++ trunk/src/init.c	2006-07-04 11:55:00 UTC (rev 174)
@@ -196,7 +196,7 @@
   instdir = read_w32_registry_string ("HKEY_LOCAL_MACHINE", REGKEY,
 				      "Install Directory");
   if (!instdir)
-    return;
+    return NULL;
   
   /* Build the key: "<instdir>/share/locale".  */
 #define SLDIR "\\share\\locale"
@@ -204,7 +204,7 @@
   if (!dname)
     {
       free (instdir);
-      return;
+      return NULL;
     }
   p = dname;
   strcpy (p, instdir);