From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tanay Abhra Subject: [PATCH v5] commit.c: use skip_prefix() instead of starts_with() Date: Tue, 4 Mar 2014 14:07:11 -0800 Message-ID: <1393970831-3558-1-git-send-email-tanayabh@gmail.com> Cc: mhagger@alum.mit.edu, gitster@pobox.com, max@quendi.de, Tanay Abhra To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 04 23:08:17 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKxVV-00013S-B4 for gcvg-git-2@plane.gmane.org; Tue, 04 Mar 2014 23:08:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757460AbaCDWII (ORCPT ); Tue, 4 Mar 2014 17:08:08 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:49826 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755763AbaCDWIF (ORCPT ); Tue, 4 Mar 2014 17:08:05 -0500 Received: by mail-pd0-f172.google.com with SMTP id p10so137434pdj.31 for ; Tue, 04 Mar 2014 14:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=xFlbKDVIMFto1q9ScLOiqCLFz4upMyCrHb1MdZl7eTw=; b=ke0Oel4Ra4nw8nYYTM9uXwUM4hPIhlX5yCzroogNXSTSfGWdEsI5eA6iidKuI4Fwni 3csfw+Wp3H38TLgX8RoF/PHw+TWeFdhJeNpEjv3DWJHKslP7Ar8fjUo1/nZj1VNbEHTO 8d6JI0Q+X9/expVmxRpMzv6WYUji6NcmcOs0lMgnrBOITv0ZJHeqHqaQOtRrqNH4dbOb 9id6ryy9oPsrmlxIeCk4HF3o/XxKCM6HI1Th4w+LHU+QnVfodB6XmCRwL2SGwMV4WlKD pwewmI3J5oe8/uFmkzRLOmWPoT+hXsVLwI6xhF/eqnCyK+OGwjvc3aPrfBTFsYDp/MYs 2R9w== X-Received: by 10.68.240.36 with SMTP id vx4mr2346456pbc.140.1393970885137; Tue, 04 Mar 2014 14:08:05 -0800 (PST) Received: from localhost.localdomain ([59.178.55.189]) by mx.google.com with ESMTPSA id z3sm1423564pas.15.2014.03.04.14.08.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 14:08:04 -0800 (PST) X-Mailer: git-send-email 1.9.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In record_author_date() & parse_gpg_output(), the callers of starts_with() not just want to know if the string starts with the prefix, but also can benefit from knowing the string that follows the prefix. By using skip_prefix(), we can do both at the same time. Helped-by: Max Horn Helped-by: Junio C Hamano Helped-by: Michael Haggerty Signed-off-by: Tanay Abhra --- Patch V5 Minor revision of indentation Patch V4 Identation improved, removed useless comment. [1] Thanks to Junio C Hamano and Max Horn. [1] http://article.gmane.org/gmane.comp.version-control.git/243388 Patch V3 Variable naming improved, removed assignments inside conditionals. Thanks to Junio C Hamano and Max Horn. Patch V2 Corrected email formatting ,reapplied the implementation according to suggestions. Thanks to Michael Haggerty. This is in respect to GSoC microproject #10. In record_author_date(), extra and useless calls to strlen due to using starts_with() were removed by using skip_prefix(). Extra variable "ident_line" was used as "buf" is used in for loop update check. Other usages of starts_with() in the same file can be found with, $ grep -n starts_with commit.c 1116: else if (starts_with(line, gpg_sig_header) && 1196: if (starts_with(buf, sigcheck_gpg_status[i].check + 1)) { The starts_with() in line 1116 was left as it is, as strlen values were pre computed as global variables, and replacing may hamper the clarity. The starts_with() in line 1196 was replaced as it abstracts way the skip_prefix part by directly using the function. Also skip_prefix() is inline when compared to starts_with(). --- commit.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..d37675c 100644 --- a/commit.c +++ b/commit.c @@ -548,7 +548,7 @@ define_commit_slab(author_date_slab, unsigned long); static void record_author_date(struct author_date_slab *author_date, struct commit *commit) { - const char *buf, *line_end; + const char *buf, *line_end, *ident_line; char *buffer = NULL; struct ident_split ident; char *date_end; @@ -566,14 +566,14 @@ static void record_author_date(struct author_date_slab *author_date, buf; buf = line_end + 1) { line_end = strchrnul(buf, '\n'); - if (!starts_with(buf, "author ")) { + ident_line = skip_prefix(buf, "author "); + if (!ident_line) { if (!line_end[0] || line_end[1] == '\n') return; /* end of header */ continue; } if (split_ident_line(&ident, - buf + strlen("author "), - line_end - (buf + strlen("author "))) || + ident_line, line_end - ident_line) || !ident.date_begin || !ident.date_end) goto fail_exit; /* malformed "author" line */ break; @@ -1193,10 +1193,8 @@ static void parse_gpg_output(struct signature_check *sigc) for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { const char *found, *next; - if (starts_with(buf, sigcheck_gpg_status[i].check + 1)) { - /* At the very beginning of the buffer */ - found = buf + strlen(sigcheck_gpg_status[i].check + 1); - } else { + found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1); + if(!found) { found = strstr(buf, sigcheck_gpg_status[i].check); if (!found) continue; -- 1.9.0