1 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 8771190..f74a90b 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 	                cleanup(0); \
 		        errx(2, \
 			    "%s: can not invoke %ld byte tar pipeline: %s", \
-			     __FUNCTION__, \
+			     __func__, \
 			     (long)strlen(where_args), where_args); \
 		    } \
 		    strcpy(where_args, STARTSTRING); \
@@ -90,12 +90,12 @@ extract_plist(const char *home, Package *pkg)
     where_args = alloca(maxargs);
     if (!where_args) {
 	cleanup(0);
-	errx(2, "%s: can't get argument list space", __FUNCTION__);
+	errx(2, "%s: can't get argument list space", __func__);
     }
     perm_args = alloca(maxargs);
     if (!perm_args) {
 	cleanup(0);
-	errx(2, "%s: can't get argument list space", __FUNCTION__);
+	errx(2, "%s: can't get argument list space", __func__);
     }
 
     strcpy(where_args, STARTSTRING);
@@ -132,7 +132,7 @@ extract_plist(const char *home, Package *pkg)
 
 		if (strrchr(p->name,'\'')) {
 		  cleanup(0);
-		  errx(2, "%s: Bogus filename \"%s\"", __FUNCTION__, p->name);
+		  errx(2, "%s: Bogus filename \"%s\"", __func__, p->name);
 		}
 		
 		/* first try to rename it into place */
@@ -161,7 +161,7 @@ extract_plist(const char *home, Package *pkg)
 		    add_count = snprintf(&perm_args[perm_count], maxargs - perm_count, "'%s' ", p->name);
 		    if (add_count < 0 || add_count > maxargs - perm_count) {
 			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __FUNCTION__);
+			errx(2, "%s: oops, miscounted strings!", __func__);
 		    }
 		    perm_count += add_count;
 		}
@@ -181,7 +181,7 @@ extract_plist(const char *home, Package *pkg)
 		    add_count = snprintf(&where_args[where_count], maxargs - where_count, " '%s'", p->name);
 		    if (add_count < 0 || add_count > maxargs - where_count) {
 			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __FUNCTION__);
+			errx(2, "%s: oops, miscounted strings!", __func__);
 		    }
 		    where_count += add_count;
 		    add_count = snprintf(&perm_args[perm_count],
@@ -189,7 +189,7 @@ extract_plist(const char *home, Package *pkg)
 					 "'%s' ", p->name);
 		    if (add_count < 0 || add_count > maxargs - perm_count) {
 			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __FUNCTION__);
+			errx(2, "%s: oops, miscounted strings!", __func__);
 		    }
 		    perm_count += add_count;
 		}
@@ -203,7 +203,7 @@ extract_plist(const char *home, Package *pkg)
 	    if (strcmp(p->name, ".")) {
 		if (!Fake && make_hierarchy(p->name) == FAIL) {
 		    cleanup(0);
-		    errx(2, "%s: unable to cwd to '%s'", __FUNCTION__, p->name);
+		    errx(2, "%s: unable to cwd to '%s'", __func__, p->name);
 		}
 		Directory = p->name;
 	    }
@@ -216,12 +216,12 @@ extract_plist(const char *home, Package *pkg)
 		 strstr(p->name, "%f")) && last_file == NULL) {
 		cleanup(0);
 		errx(2, "%s: no last file specified for '%s' command",
-		    __FUNCTION__, p->name);
+		    __func__, p->name);
 	    }
 	    if (strstr(p->name, "%D") && Directory == NULL) {
 		cleanup(0);
 		errx(2, "%s: no directory specified for '%s' command",
-		    __FUNCTION__, p->name);
+		    __func__, p->name);
 	    }
 	    format_cmd(cmd, p->name, Directory, last_file);
 	    PUSHOUT(Directory);