From owner-svn-src-head@freebsd.org Thu May 19 18:51:49 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC157B42F17 for ; Thu, 19 May 2016 18:51:49 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7B1F212D6 for ; Thu, 19 May 2016 18:51:49 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by mail-wm0-x231.google.com with SMTP id w143so1341770wmw.0 for ; Thu, 19 May 2016 11:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=from:mime-version:references:in-reply-to:date:message-id:subject:to :cc; bh=26putL70uUIGvnK3EBT/3fQY9lV45bRGuk7TADWzR4w=; b=vbHDz+idCy/YBpyFvFO6IzIvNnXcxmazrnnpF6Y4uROsA/UR/ItZort5YJUSg9cBnT Pi2scnogtIZRxtRNra9QnHdHcNBlSATUb+QA9xi7hpYkeEK5bc+sp6bEverf9vGl/sLe P+vz7iu36jrWX3IXTLnZf3vIZg7Ut2wedeWvQmtmLgptW9r9xvx7C4itpNgBmc3Y7hiQ T68k/KuEW7t4GfJHhAPl6GfNNWnRHXqbkt9ZleZHTUqwuM7RlkPESo8czjE0n4mHMqne 6bMHuFc7iinjY2mIh26uqvNkyImBm4rmOZ4096IumZB5hyjRi6HFNdWsNQF179HQAABS XkIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:mime-version:references:in-reply-to:date :message-id:subject:to:cc; bh=26putL70uUIGvnK3EBT/3fQY9lV45bRGuk7TADWzR4w=; b=hG2Ok48HeUIym3w9CbGdYUXxlNRsQJ2Kr3IxAaJLVKyASsgAoNxIGoHvskfAnAj/Oh iKRIFWOBDdrgUXzOH19yq7vzKnnSCkwTsJvI5c9M+zUCaRQPQ1DTdYhUVqoSnYiTzHn8 o7gReDapOl10jvNcFvMuzE43qMzhOcYJJx7MYzoLnHZ32Vg0m6dRR1I2bhxBAgKaQBIN /iwlABU9Ag+i/FfPeAcIqAjcyay7f/KlhZpLBBRZnUuFLYy1i9Q3TPzKooKKRrLjJnVg O9jfGecTv34WnctjBOGFXTL8qe2aSDjQd/jJfwbrZiVI/OuoMWL+wiaEx7PcVvOvhe2s ZH2w== X-Gm-Message-State: AOPr4FVHsmpoTvqU2Be+sfoja2sf/kKtsK8fdEs55lip14Lw9SbUAQbUU2Q9vqJPLfxExqXpEyov4xDhA3+dF1r8 X-Received: by 10.194.69.106 with SMTP id d10mr15225663wju.165.1463683907900; Thu, 19 May 2016 11:51:47 -0700 (PDT) From: Steven Hartland Mime-Version: 1.0 (1.0) References: <201605191714.u4JHEOnn037348@repo.freebsd.org> In-Reply-To: <201605191714.u4JHEOnn037348@repo.freebsd.org> Date: Thu, 19 May 2016 19:51:41 +0100 Message-ID: <4596681286066293430@unknownmsgid> Subject: Re: svn commit: r300219 - in head/sys: kern sys To: Scott Long Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2016 18:51:49 -0000 I thought it was considered better to use if (var == NULL) instead of if (!var) for pointers as they aren't bools? > On 19 May 2016, at 18:14, Scott Long wrote: > > Author: scottl > Date: Thu May 19 17:14:24 2016 > New Revision: 300219 > URL: https://svnweb.freebsd.org/changeset/base/300219 > > Log: > Adjust the creation of tq_name so it can be freed correctly > > Reviewed by: jhb, allanjude > Differential Revision: D6454 > > Modified: > head/sys/kern/subr_taskqueue.c > head/sys/sys/taskqueue.h > > Modified: head/sys/kern/subr_taskqueue.c > ============================================================================== > --- head/sys/kern/subr_taskqueue.c Thu May 19 17:02:33 2016 (r300218) > +++ head/sys/kern/subr_taskqueue.c Thu May 19 17:14:24 2016 (r300219) > @@ -128,16 +128,17 @@ _taskqueue_create(const char *name, int > int mtxflags, const char *mtxname __unused) > { > struct taskqueue *queue; > - char *tq_name = NULL; > + char *tq_name; > > - if (name != NULL) > - tq_name = strndup(name, 32, M_TASKQUEUE); > - if (tq_name == NULL) > - tq_name = "taskqueue"; > + tq_name = malloc(TASKQUEUE_NAMELEN, M_TASKQUEUE, mflags | M_ZERO); > + if (!tq_name) > + return (NULL); > + > + snprintf(tq_name, TASKQUEUE_NAMELEN, "%s", (name) ? name : "taskqueue"); > > queue = malloc(sizeof(struct taskqueue), M_TASKQUEUE, mflags | M_ZERO); > if (!queue) > - return NULL; > + return (NULL); > > STAILQ_INIT(&queue->tq_queue); > TAILQ_INIT(&queue->tq_active); > @@ -153,7 +154,7 @@ _taskqueue_create(const char *name, int > queue->tq_flags |= TQ_FLAGS_UNLOCKED_ENQUEUE; > mtx_init(&queue->tq_mutex, tq_name, NULL, mtxflags); > > - return queue; > + return (queue); > } > > struct taskqueue * > > Modified: head/sys/sys/taskqueue.h > ============================================================================== > --- head/sys/sys/taskqueue.h Thu May 19 17:02:33 2016 (r300218) > +++ head/sys/sys/taskqueue.h Thu May 19 17:14:24 2016 (r300219) > @@ -56,6 +56,7 @@ enum taskqueue_callback_type { > #define TASKQUEUE_CALLBACK_TYPE_MIN TASKQUEUE_CALLBACK_TYPE_INIT > #define TASKQUEUE_CALLBACK_TYPE_MAX TASKQUEUE_CALLBACK_TYPE_SHUTDOWN > #define TASKQUEUE_NUM_CALLBACKS TASKQUEUE_CALLBACK_TYPE_MAX + 1 > +#define TASKQUEUE_NAMELEN 32 > > typedef void (*taskqueue_callback_fn)(void *context); > >