[gentoo-commits] gentoo-projects commit in portage-utils: main.c

[Mike Frysinger (vapier)]

vapier      11/12/22 17:49:19

  Modified:             main.c
  Log:
  have the one user pass in an empty string rather than always checking the param

Revision  Changes    Path
1.213                portage-utils/main.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.213&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.213&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.212&r2=1.213

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- main.c	22 Dec 2011 17:11:11 -0000	1.212
+++ main.c	22 Dec 2011 17:49:19 -0000	1.213
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.212 2011/12/22 17:11:11 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.213 2011/12/22 17:49:19 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -619,8 +619,6 @@
 	char buf[BUFSIZE], *s;
 
 	/* initialize the base profile path */
-	if (!configroot)
-		configroot = "";
 	configroot_len = strlen(configroot);
 	profile_len = strlen(profile);
 	sub_len = 1024;	/* should be big enough for longest line in "parent" */
@@ -644,7 +642,7 @@
 	s = strtok(buf, "\n");
 	while (s) {
 		strncpy(sub_file, s, sub_len);
-		read_portage_profile(NULL, profile_file, vars);
+		read_portage_profile("", profile_file, vars);
 		s = strtok(NULL, "\n");
 	}