diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-12-30 13:09:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-12-30 13:09:20 +0000 |
| commit | 5d3c2f5be7e4d5c7df81015e0b051fe84c8885a5 (patch) | |
| tree | 110778112f2f4fe3f20bc7f2007cffaf0e712522 | |
| parent | drop local func decls as we already include xfuncs.h and get them (diff) | |
| download | pax-utils-5d3c2f5be7e4d5c7df81015e0b051fe84c8885a5.tar.gz pax-utils-5d3c2f5be7e4d5c7df81015e0b051fe84c8885a5.tar.bz2 pax-utils-5d3c2f5be7e4d5c7df81015e0b051fe84c8885a5.zip | |
fixup const handling in getstr_perms()
| -rw-r--r-- | scanelf.c | 15 | ||||
| -rw-r--r-- | scanmacho.c | 13 |
2 files changed, 13 insertions, 15 deletions
@@ -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.203 2008/12/30 12:39:53 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.204 2008/12/30 13:09:20 vapier Exp $ * * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org> * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org> */ -static const char *rcsid = "$Id: scanelf.c,v 1.203 2008/12/30 12:39:53 vapier Exp $"; +static const char *rcsid = "$Id: scanelf.c,v 1.204 2008/12/30 13:09:20 vapier Exp $"; const char * const argv0 = "scanelf"; #include "paxinc.h" @@ -78,18 +78,17 @@ static unsigned long setpax = 0UL; static int has_objdump = 0; -static char *getstr_perms(const char *fname); -static char *getstr_perms(const char *fname) +static const char *getstr_perms(const char *fname) { struct stat st; static char buf[8]; - if ((stat(fname, &st)) == (-1)) - return (char *) ""; + if (stat(fname, &st) == -1) + return ""; snprintf(buf, sizeof(buf), "%o", st.st_mode); - return (char *) buf + 2; + return buf + 2; } /* find the path to a file by name */ @@ -108,7 +107,7 @@ static char *which(const char *fname) *p = 0; if (access(fullpath, R_OK) != (-1)) { free(path); - return (char *) fullpath; + return fullpath; } } free(path); diff --git a/scanmacho.c b/scanmacho.c index 35d6184..cf1b042 100644 --- a/scanmacho.c +++ b/scanmacho.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v 1.9 2008/12/30 12:39:53 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v 1.10 2008/12/30 13:09:20 vapier Exp $ * * based on scanelf by: * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org> @@ -10,7 +10,7 @@ * 2008 Fabian Groffen - <grobian@gentoo.org> */ -static const char *rcsid = "$Id: scanmacho.c,v 1.9 2008/12/30 12:39:53 vapier Exp $"; +static const char *rcsid = "$Id: scanmacho.c,v 1.10 2008/12/30 13:09:20 vapier Exp $"; const char * const argv0 = "scanmacho"; #include "paxinc.h" @@ -53,18 +53,17 @@ static char g_match = 0; static int match_bits = 0; static unsigned int match_perms = 0; -static char *getstr_perms(const char *fname); -static char *getstr_perms(const char *fname) +static const char *getstr_perms(const char *fname) { struct stat st; static char buf[8]; - if ((stat(fname, &st)) == (-1)) - return (char *) ""; + if (stat(fname, &st) == -1) + return ""; snprintf(buf, sizeof(buf), "%o", st.st_mode); - return (char *) buf + 2; + return buf + 2; } static const char *macho_file_needed_lib( |