diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-11-15 20:03:27 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-11-15 20:03:27 -0800 |
| commit | 4656d4747c8743290bfbe910c64cd75eb4e4af8d (patch) | |
| tree | 241d8b3f0b8796e33937c6a27c670eba002f8f04 /usr/src/lib/libpkg/common/gpkgmap.c | |
| parent | 60bec29ea42d65ac648c69b0fb189273e286ca57 (diff) | |
| download | illumos-joyent-4656d4747c8743290bfbe910c64cd75eb4e4af8d.tar.gz | |
420 remove patch (sparse package) support from svr4 pkg
421 libpkg and libadm need to be lint clean
Reviewed by: gwr@nexenta.com
Reviewed by: peter.tribble@gmail.com
Approved by: gwr@nexenta.com
Diffstat (limited to 'usr/src/lib/libpkg/common/gpkgmap.c')
| -rw-r--r-- | usr/src/lib/libpkg/common/gpkgmap.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/usr/src/lib/libpkg/common/gpkgmap.c b/usr/src/lib/libpkg/common/gpkgmap.c index d94b16c4d1..4bbe60dfc3 100644 --- a/usr/src/lib/libpkg/common/gpkgmap.c +++ b/usr/src/lib/libpkg/common/gpkgmap.c @@ -147,13 +147,8 @@ gpkgmap(struct cfent *ept, FILE *fp) ept->ainfo.mode = d_mode; (void) strcpy(ept->ainfo.owner, d_owner); (void) strcpy(ept->ainfo.group, d_group); -#ifdef SUNOS41 - ept->ainfo.xmajor = BADMAJOR; - ept->ainfo.xminor = BADMINOR; -#else ept->ainfo.major = BADMAJOR; ept->ainfo.minor = BADMINOR; -#endif ept->cinfo.cksum = ept->cinfo.modtime = ept->cinfo.size = (-1L); ept->npkgs = 0; @@ -310,18 +305,10 @@ error: } if (strchr("cb", ept->ftype)) { -#ifdef SUNOS41 - ept->ainfo.xmajor = BADMAJOR; - ept->ainfo.xminor = BADMINOR; - if (getnum(fp, 10, (long *)&ept->ainfo.xmajor, BADMAJOR) || - getnum(fp, 10, (long *)&ept->ainfo.xminor, BADMINOR)) -#else ept->ainfo.major = BADMAJOR; ept->ainfo.minor = BADMINOR; if (getnum(fp, 10, (long *)&ept->ainfo.major, BADMAJOR) || - getnum(fp, 10, (long *)&ept->ainfo.minor, BADMINOR)) -#endif - { + getnum(fp, 10, (long *)&ept->ainfo.minor, BADMINOR)) { setErrstr(pkg_gt(ERR_CANNOT_READ_MM_DEVNUMS)); goto error; } |