[gentoo-commits] gentoo-projects commit in pax-utils: scanelf.c

[Mike Frysinger (vapier)]

vapier      08/09/29 06:01:22

  Modified:             scanelf.c
  Log:
  only issue warnings on missing cache code when targeting an ELF system

Revision  Changes    Path
1.192                pax-utils/scanelf.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.192&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.192&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?r1=1.191&r2=1.192

Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- scanelf.c	17 Jun 2008 17:07:57 -0000	1.191
+++ scanelf.c	29 Sep 2008 06:01:22 -0000	1.192
@@ -1,13 +1,13 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.191 2008/06/17 17:07:57 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.192 2008/09/29 06:01:22 vapier Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@g.o>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@g.o>
  */
 
-static const char *rcsid = "$Id: scanelf.c,v 1.191 2008/06/17 17:07:57 solar Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.192 2008/09/29 06:01:22 vapier Exp $";
 const char * const argv0 = "scanelf";
 
 #include "paxinc.h"
@@ -796,7 +796,9 @@
 	return NULL;
 }
 #else
+#ifdef __ELF__
 #warning Cache support not implemented for your target
+#endif
 static char *lookup_cache_lib(elfobj *elf, char *fname)
 {
 	return NULL;
@@ -1546,13 +1548,14 @@
 }
 
 #else
-
+#ifdef __ELF__
 #warning Cache config support not implemented for your target
+#endif
 static int load_ld_cache_config(int i, const char *fname)
 {
 	memset(ldpaths, 0x00, sizeof(ldpaths));
+	return 0;
 }
-
 #endif
 
 /* scan /etc/ld.so.conf for paths */