From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 07/26] upload-pack: use skip_prefix() instead of starts_with()
Date: Wed, 13 Apr 2016 19:54:51 +0700 [thread overview]
Message-ID: <1460552110-5554-8-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1460552110-5554-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
upload-pack.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index bfb7985..257ad48 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -276,7 +276,7 @@ static void create_pack_file(void)
die("git upload-pack: %s", abort_msg);
}
-static int got_sha1(char *hex, unsigned char *sha1)
+static int got_sha1(const char *hex, unsigned char *sha1)
{
struct object *o;
int we_knew_they_have = 0;
@@ -382,6 +382,8 @@ static int get_common_commits(void)
for (;;) {
char *line = packet_read_line(0, NULL);
+ const char *arg;
+
reset_timeout();
if (!line) {
@@ -403,8 +405,8 @@ static int get_common_commits(void)
got_other = 0;
continue;
}
- if (starts_with(line, "have ")) {
- switch (got_sha1(line+5, sha1)) {
+ if (skip_prefix(line, "have ", &arg)) {
+ switch (got_sha1(arg, sha1)) {
case -1: /* they have what we do not */
got_other = 1;
if (multi_ack && ok_to_give_up()) {
@@ -616,14 +618,16 @@ static void receive_needs(void)
const char *features;
unsigned char sha1_buf[20];
char *line = packet_read_line(0, NULL);
+ const char *arg;
+
reset_timeout();
if (!line)
break;
- if (starts_with(line, "shallow ")) {
+ if (skip_prefix(line, "shallow ", &arg)) {
unsigned char sha1[20];
struct object *object;
- if (get_sha1_hex(line + 8, sha1))
+ if (get_sha1_hex(arg, sha1))
die("invalid shallow line: %s", line);
object = parse_object(sha1);
if (!object)
@@ -636,19 +640,19 @@ static void receive_needs(void)
}
continue;
}
- if (starts_with(line, "deepen ")) {
+ if (skip_prefix(line, "deepen ", &arg)) {
char *end;
- depth = strtol(line + 7, &end, 0);
- if (end == line + 7 || depth <= 0)
+ depth = strtol(arg, &end, 0);
+ if (end == arg || depth <= 0)
die("Invalid deepen: %s", line);
continue;
}
- if (!starts_with(line, "want ") ||
- get_sha1_hex(line+5, sha1_buf))
+ if (!skip_prefix(line, "want ", &arg) ||
+ get_sha1_hex(arg, sha1_buf))
die("git upload-pack: protocol error, "
"expected to get sha, not '%s'", line);
- features = line + 45;
+ features = arg + 40;
if (parse_feature_request(features, "multi_ack_detailed"))
multi_ack = 2;
--
2.8.0.rc0.210.gd302cd2
next prev parent reply other threads:[~2016-04-13 12:55 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 12:54 [PATCH 00/26] nd/shallow-deepen updates Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 01/26] remote-curl.c: convert fetch_git() to use argv_array Nguyễn Thái Ngọc Duy
2016-05-25 6:41 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 02/26] transport-helper.c: refactor set_helper_option() Nguyễn Thái Ngọc Duy
2016-05-25 6:47 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 03/26] upload-pack: move shallow deepen code out of receive_needs() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 04/26] upload-pack: move "shallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 05/26] upload-pack: remove unused variable "backup" Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 06/26] upload-pack: move "unshallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` Nguyễn Thái Ngọc Duy [this message]
2016-05-25 7:02 ` [PATCH 07/26] upload-pack: use skip_prefix() instead of starts_with() Eric Sunshine
2016-04-13 12:54 ` [PATCH 08/26] upload-pack: tighten number parsing at "deepen" lines Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 09/26] upload-pack: move rev-list code out of check_non_tip() Nguyễn Thái Ngọc Duy
2016-05-25 7:36 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 10/26] fetch-pack: use skip_prefix() instead of starts_with() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 11/26] fetch-pack: use a common function for verbose printing Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 12/26] fetch-pack.c: mark strings for translating Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 13/26] fetch-pack: use a separate flag for fetch in deepening mode Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 14/26] shallow.c: implement a generic shallow boundary finder based on rev-list Nguyễn Thái Ngọc Duy
2016-05-27 4:00 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 15/26] upload-pack: add deepen-since to cut shallow repos based on time Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 16/26] fetch: define shallow boundary with --shallow-since Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 17/26] clone: define shallow clone boundary based on time " Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 18/26] t5500, t5539: tests for shallow depth since a specific date Nguyễn Thái Ngọc Duy
2016-06-05 4:43 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 19/26] refs: add expand_ref() Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 20/26] upload-pack: support define shallow boundary by excluding revisions Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 21/26] fetch: define shallow boundary with --shallow-exclude Nguyễn Thái Ngọc Duy
2016-06-05 5:03 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 22/26] clone: define shallow clone " Nguyễn Thái Ngọc Duy
2016-06-05 5:05 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 23/26] t5500, t5539: tests for shallow depth excluding a ref Nguyễn Thái Ngọc Duy
2016-06-05 5:09 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 24/26] upload-pack: split check_unreachable() in two, prep for get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:43 ` Eric Sunshine
2016-06-10 12:14 ` Duy Nguyen
2016-04-13 12:55 ` [PATCH 25/26] upload-pack: add get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:51 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 26/26] fetch, upload-pack: --deepen=N extends shallow boundary by N commits Nguyễn Thái Ngọc Duy
2016-04-14 16:12 ` [PATCH 00/26] nd/shallow-deepen updates Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460552110-5554-8-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).