From: Arch Librarian <arch@canonical.com>
Date: Thu, 14 Jul 2005 13:05:28 +0000 (+0000)
Subject: 2002-10-02  Anders Carlsson  <andersca@gnu.org>
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5568e329423cdce20680095e589a548c5ceb27c3;p=pkg-config

2002-10-02  Anders Carlsson  <andersca@gnu.org>
Author: andersca
Date: 2002-10-02 09:10:10 GMT
2002-10-02  Anders Carlsson  <andersca@gnu.org>

	* pkg.c (add_env_variable_to_list): Don't return NULL, return
	the new list.
	(verify_package): break if we've removed the variable.
---

diff --git a/ChangeLog b/ChangeLog
index 8e75d8c..e8fea93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-02  Anders Carlsson  <andersca@gnu.org>
+
+	* pkg.c (add_env_variable_to_list): Don't return NULL, return
+	the new list.
+	(verify_package): break if we've removed the variable.
+
 2002-09-26  Tor Lillqvist  <tml@iki.fi>
 
 	* parse.c (get_compat_package): Return NULL right away on
diff --git a/pkg.c b/pkg.c
index b9e5707..66e1e8e 100644
--- a/pkg.c
+++ b/pkg.c
@@ -656,7 +656,7 @@ add_env_variable_to_list (GSList *list, const gchar *env)
     }
   g_strfreev (values);
 
-  return NULL;
+  return list;
 }
 
 static void
@@ -822,6 +822,8 @@ verify_package (Package *pkg)
 		      debug_spew ("Removing %s from cflags for %s\n", iter->data, pkg->key);
 		      ++count;
 		      iter->data = NULL;
+		      
+		      break;
 		    }
 		}
 	      system_dir_iter = system_dir_iter->next;