PERFORCE change 104072 for review

Todd Miller millert at FreeBSD.org
Tue Aug 15 17:53:25 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=104072

Change 104072 by millert at millert_macbook on 2006/08/15 17:50:45

	Use __func__ in error message instead of hard-coding the
	wrong thing (cut & pasto).  Also replace an instance of
	__FUNCTION__ (old gccism) with __func__ (c99).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 (text+ko) ====

@@ -691,8 +691,8 @@
 		goto dosclass;
 	}
 	if (error) {
-		printf("sebsd_update_vnode_from_extattr: ERROR %d returned "
-		    " by mac_vnop_getxattr()\n", error);
+		printf("%s: ERROR %d returned by mac_vnop_getxattr()\n",
+		    __func__, error);
 		return (error); /* Fail closed */
 	}
 
@@ -702,8 +702,8 @@
 
 	error = security_context_to_sid(context, context_len, &vsec->sid);
 	if (error) {
-		printf("sebsd_update_vnode_from_extattr: ERROR mapping "
-		       "context to sid: %.*s\n", context_len, context);
+		printf("%s: ERROR mapping context to sid: %.*s\n",
+		    __func__, context_len, context);
 		return (0);	/* TBD bad, bad, bad */
 	}
 
@@ -1256,7 +1256,7 @@
 		break;
 	default:
 		printf("%s:  security_fs_use(%s) returned unrecognized "
-		    "behavior %d\n", __FUNCTION__, mp->mnt_vtable->vfc_name,
+		    "behavior %d\n", __func__, mp->mnt_vtable->vfc_name,
 		    behavior);
 		behavior = SECURITY_FS_USE_NONE;
 		break;


More information about the trustedbsd-cvs mailing list