diff options
| author | David Höppner <0xffea@gmail.com> | 2015-03-01 12:40:06 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-03-09 10:13:14 -0400 |
| commit | 2cf749481ab62b6f2e7a25e42c1870d102ce112c (patch) | |
| tree | da91e08fb7b226e784e16eeacee6514e1bd9b7fd /usr/src/lib/libcmdutils | |
| parent | 356f579978bd7347c891f2a7b1e9671086f183ae (diff) | |
| download | illumos-gate-2cf749481ab62b6f2e7a25e42c1870d102ce112c.tar.gz | |
1150 libcmdutils has superfluous #define
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/lib/libcmdutils')
| -rw-r--r-- | usr/src/lib/libcmdutils/common/writefile.c | 14 | ||||
| -rw-r--r-- | usr/src/lib/libcmdutils/libcmdutils.h | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/usr/src/lib/libcmdutils/common/writefile.c b/usr/src/lib/libcmdutils/common/writefile.c index 750974c581..84cdb78d60 100644 --- a/usr/src/lib/libcmdutils/common/writefile.c +++ b/usr/src/lib/libcmdutils/common/writefile.c @@ -37,8 +37,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "libcmdutils.h" @@ -98,7 +96,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, (void) snprintf(targbuf, targ_size, "%s", outfile); } - if (ISREG(*s1p) && s1p->st_size > SMALLFILESIZE) { + if (S_ISREG(s1p->st_mode) && s1p->st_size > SMALLFILESIZE) { /* * Determine size of initial mapping. This will determine the * size of the address space chunk we work with. This initial @@ -140,7 +138,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, (void) close(fi); (void) close(fo); (void) munmap(cp, munmapsize); - if (ISREG(*s2p)) + if (S_ISREG(s2p->st_mode)) (void) unlink(targbuf); return (1); } @@ -164,7 +162,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, (void) close(fi); (void) close(fo); (void) munmap(cp, munmapsize); - if (ISREG(*s2p)) + if (S_ISREG(s2p->st_mode)) (void) unlink(targbuf); if (srcbuf != NULL) free(srcbuf); @@ -184,7 +182,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, (void) close(fi); (void) close(fo); (void) munmap(cp, munmapsize); - if (ISREG(*s2p)) + if (S_ISREG(s2p->st_mode)) (void) unlink(targbuf); if (srcbuf != NULL) free(srcbuf); @@ -203,7 +201,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, } else if (n < 0) { (void) close(fi); (void) close(fo); - if (ISREG(*s2p)) + if (S_ISREG(s2p->st_mode)) (void) unlink(targbuf); if (srcbuf != NULL) free(srcbuf); @@ -213,7 +211,7 @@ writefile(int fi, int fo, char *infile, char *outfile, char *asfile, } else if (write(fo, buf, n) != n) { (void) close(fi); (void) close(fo); - if (ISREG(*s2p)) + if (S_ISREG(s2p->st_mode)) (void) unlink(targbuf); if (srcbuf != NULL) free(srcbuf); diff --git a/usr/src/lib/libcmdutils/libcmdutils.h b/usr/src/lib/libcmdutils/libcmdutils.h index a280751c27..bbc03475dc 100644 --- a/usr/src/lib/libcmdutils/libcmdutils.h +++ b/usr/src/lib/libcmdutils/libcmdutils.h @@ -68,7 +68,6 @@ extern "C" { #define MAXMAPSIZE (1024*1024*8) /* map at most 8MB */ #define SMALLFILESIZE (32*1024) /* don't use mmap on little file */ -#define ISREG(A) (((A).st_mode & S_IFMT) == S_IFREG) /* avltree */ #define OFFSETOF(s, m) ((size_t)(&(((s *)0)->m))) |