diff options
| author | alfred <alfred@FreeBSD.org> | 2002-05-11 03:48:49 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-05-11 03:48:49 +0000 |
| commit | 7be446ee1c9d1c224ed502e2943f86134e3e174f (patch) | |
| tree | dfb1883ff0dc02633230f624e01908bce5789799 /usr.sbin/pkg_install/delete | |
| parent | 02509bfc4bc35c1903d356df602509ca34028118 (diff) | |
| download | FreeBSD-src-7be446ee1c9d1c224ed502e2943f86134e3e174f.zip FreeBSD-src-7be446ee1c9d1c224ed502e2943f86134e3e174f.tar.gz | |
fix build:
you may not use string concatination with __FUNCTION__, replace all occurances
of:
__FUNCTION__ ": error string"
with:
"%s: error string"
Diffstat (limited to 'usr.sbin/pkg_install/delete')
| -rw-r--r-- | usr.sbin/pkg_install/delete/perform.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 77635ef..ffbfbd9 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -140,7 +140,7 @@ pkg_do(char *pkg) if (!getcwd(home, FILENAME_MAX)) { cleanup(0); - errx(2, __FUNCTION__ ": unable to get current working directory!"); + errx(2, "%s: unable to get current working directory!", __FUNCTION__); } if (chdir(LogDir) == FAIL) { @@ -240,7 +240,8 @@ pkg_do(char *pkg) if (chdir(home) == FAIL) { cleanup(0); - errx(2, __FUNCTION__ ": unable to return to working directory %s!", home); + errx(2, "%s: unable to return to working directory %s!", __FUNCTION__, + home); } /* @@ -272,7 +273,8 @@ pkg_do(char *pkg) if (chdir(home) == FAIL) { cleanup(0); - errx(2, __FUNCTION__ ": unable to return to working directory %s!", home); + errx(2, "%s: unable to return to working directory %s!", __FUNCTION__, + home); } if (!Fake) { @@ -299,7 +301,8 @@ sanity_check(char *pkg) { if (!fexists(CONTENTS_FNAME)) { cleanup(0); - errx(2, __FUNCTION__ ": installed package %s has no %s file!", pkg, CONTENTS_FNAME); + errx(2, "%s: installed package %s has no %s file!", __FUNCTION__, + pkg, CONTENTS_FNAME); } } |
