From owner-svn-src-all@FreeBSD.ORG Mon Dec 17 10:48:11 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A08BC98; Mon, 17 Dec 2012 10:48:11 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1F5288FC0C; Mon, 17 Dec 2012 10:48:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHAmAc4070978; Mon, 17 Dec 2012 10:48:11 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHAmAkk070977; Mon, 17 Dec 2012 10:48:10 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201212171048.qBHAmAkk070977@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Mon, 17 Dec 2012 10:48:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244351 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 10:48:11 -0000 Author: pjd Date: Mon Dec 17 10:48:10 2012 New Revision: 244351 URL: http://svnweb.freebsd.org/changeset/base/244351 Log: Better variables naming in expand_name() to be more consistent with coredump(). Obtained from: WHEEL Systems Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Mon Dec 17 10:38:51 2012 (r244350) +++ head/sys/kern/kern_sig.c Mon Dec 17 10:48:10 2012 (r244351) @@ -3045,23 +3045,23 @@ SYSCTL_STRING(_kern, OID_AUTO, corefile, * This is controlled by the sysctl variable kern.corefile (see above). */ static char * -expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td, +expand_name(const char *comm, uid_t uid, pid_t pid, struct thread *td, int compress) { struct sbuf sb; const char *format; - char *temp; + char *name; size_t i; int indexpos; char *hostname; hostname = NULL; format = corefilename; - temp = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO); - if (temp == NULL) + name = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO); + if (name == NULL) return (NULL); indexpos = -1; - (void)sbuf_new(&sb, temp, MAXPATHLEN, SBUF_FIXEDLEN); + (void)sbuf_new(&sb, name, MAXPATHLEN, SBUF_FIXEDLEN); for (i = 0; format[i]; i++) { switch (format[i]) { case '%': /* Format character */ @@ -3079,7 +3079,7 @@ expand_name(const char *name, uid_t uid, "pid %ld (%s), uid (%lu): " "unable to alloc memory " "for corefile hostname\n", - (long)pid, name, + (long)pid, comm, (u_long)uid); goto nomem; } @@ -3093,7 +3093,7 @@ expand_name(const char *name, uid_t uid, indexpos = sbuf_len(&sb) - 1; break; case 'N': /* process name */ - sbuf_printf(&sb, "%s", name); + sbuf_printf(&sb, "%s", comm); break; case 'P': /* process id */ sbuf_printf(&sb, "%u", pid); @@ -3119,10 +3119,10 @@ expand_name(const char *name, uid_t uid, #endif if (sbuf_error(&sb) != 0) { log(LOG_ERR, "pid %ld (%s), uid (%lu): corename is too " - "long\n", (long)pid, name, (u_long)uid); + "long\n", (long)pid, comm, (u_long)uid); nomem: sbuf_delete(&sb); - free(temp, M_TEMP); + free(name, M_TEMP); return (NULL); } sbuf_finish(&sb); @@ -3145,9 +3145,9 @@ nomem: oflags = VN_OPEN_NOCAPCHECK; for (n = 0; n < num_cores; n++) { - temp[indexpos] = '0' + n; + name[indexpos] = '0' + n; NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, - temp, td); + name, td); error = vn_open_cred(&nd, &flags, cmode, oflags, td->td_ucred, NULL); if (error) { @@ -3156,8 +3156,8 @@ nomem: log(LOG_ERR, "pid %d (%s), uid (%u): Path `%s' failed " "on initial open test, error = %d\n", - pid, name, uid, temp, error); - free(temp, M_TEMP); + pid, comm, uid, name, error); + free(name, M_TEMP); return (NULL); } NDFREE(&nd, NDF_ONLY_PNBUF); @@ -3168,14 +3168,14 @@ nomem: "pid %d (%s), uid (%u): Path `%s' failed " "on close after initial open test, " "error = %d\n", - pid, name, uid, temp, error); - free(temp, M_TEMP); + pid, comm, uid, name, error); + free(name, M_TEMP); return (NULL); } break; } } - return (temp); + return (name); } /*