@matheusbsbs / matheus-bagliano / commits / d7e92806cd
Fork 0

Move fetch_ref from http-push.c and http-walker.c to http.c

Make the necessary changes to be ok with their difference, and rename the function http_fetch_ref. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Mike Hommey committed Dec 11, 2007 at 00:08 UTC d7e92806cdc5ca78c4db879c68f91c70ff9e1ade
4 files changed +89 -163
http-push.c
+4 -84
@@ -1067,88 +1067,6 @@ static int fetch_indices(void)
1067 return 0;
1068 }
1069
1070 -static inline int needs_quote(int ch)
1071 -{
1072 - if (((ch >= 'A') && (ch <= 'Z'))
1073 - || ((ch >= 'a') && (ch <= 'z'))
1074 - || ((ch >= '0') && (ch <= '9'))
1075 - || (ch == '/')
1076 - || (ch == '-')
1077 - || (ch == '.'))
1078 - return 0;
1079 - return 1;
1080 -}
1081 -
1082 -static inline int hex(int v)
1083 -{
1084 - if (v < 10) return '0' + v;
1085 - else return 'A' + v - 10;
1086 -}
1087 -
1088 -static char *quote_ref_url(const char *base, const char *ref)
1089 -{
1090 - const char *cp;
1091 - char *dp, *qref;
1092 - int len, baselen, ch;
1093 -
1094 - baselen = strlen(base);
1095 - len = baselen + 1;
1096 - for (cp = ref; (ch = *cp) != 0; cp++, len++)
1097 - if (needs_quote(ch))
1098 - len += 2; /* extra two hex plus replacement % */
1099 - qref = xmalloc(len);
1100 - memcpy(qref, base, baselen);
1101 - for (cp = ref, dp = qref + baselen; (ch = *cp) != 0; cp++) {
1102 - if (needs_quote(ch)) {
1103 - *dp++ = '%';
1104 - *dp++ = hex((ch >> 4) & 0xF);
1105 - *dp++ = hex(ch & 0xF);
1106 - }
1107 - else
1108 - *dp++ = ch;
1109 - }
1110 - *dp = 0;
1111 -
1112 - return qref;
1113 -}
1114 -
1115 -int fetch_ref(char *ref, unsigned char *sha1)
1116 -{
1117 - char *url;
1118 - struct strbuf buffer = STRBUF_INIT;
1119 - char *base = remote->url;
1120 - struct active_request_slot *slot;
1121 - struct slot_results results;
1122 - int ret;
1123 -
1124 - url = quote_ref_url(base, ref);
1125 - slot = get_active_slot();
1126 - slot->results = &results;
1127 - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
1128 - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1129 - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
1130 - curl_easy_setopt(slot->curl, CURLOPT_URL, url);
1131 - if (start_active_slot(slot)) {
1132 - run_active_slot(slot);
1133 - if (results.curl_result == CURLE_OK) {
1134 - strbuf_rtrim(&buffer);
1135 - if (buffer.len == 40)
1136 - ret = get_sha1_hex(buffer.buf, sha1);
1137 - else
1138 - ret = 1;
1139 - } else {
1140 - ret = error("Couldn't get %s for %s\n%s",
1141 - url, ref, curl_errorstr);
1142 - }
1143 - } else {
1144 - ret = error("Unable to start request");
1145 - }
1146 -
1147 - strbuf_release(&buffer);
1148 - free(url);
1149 - return ret;
1150 -}
1151 -
1070 static void one_remote_object(const char *hex)
1071 {
1072 unsigned char sha1[20];
@@ -1834,7 +1752,8 @@ static void one_remote_ref(char *refname)
1752 struct object *obj;
1753 int len = strlen(refname) + 1;
1754
1837 - if (fetch_ref(refname, remote_sha1) != 0) {
1755 + if (http_fetch_ref(remote->url, refname + 5 /* "refs/" */,
1756 + remote_sha1) != 0) {
1757 fprintf(stderr,
1758 "Unable to fetch ref %s from %s\n",
1759 refname, remote->url);
@@ -1966,7 +1885,8 @@ static void add_remote_info_ref(struct remote_ls_ctx *ls)
1885 int len;
1886 char *ref_info;
1887
1969 - if (fetch_ref(ls->dentry_name, remote_sha1) != 0) {
1888 + if (http_fetch_ref(remote->url, ls->dentry_name + 5 /* "refs/" */,
1889 + remote_sha1) != 0) {
1890 fprintf(stderr,
1891 "Unable to fetch ref %s from %s\n",
1892 ls->dentry_name, remote->url);
http-walker.c
+1 -79
@@ -888,88 +888,10 @@ static int fetch(struct walker *walker, unsigned char *sha1)
888 data->alt->base);
889 }
890
891 -static inline int needs_quote(int ch)
892 -{
893 - if (((ch >= 'A') && (ch <= 'Z'))
894 - || ((ch >= 'a') && (ch <= 'z'))
895 - || ((ch >= '0') && (ch <= '9'))
896 - || (ch == '/')
897 - || (ch == '-')
898 - || (ch == '.'))
899 - return 0;
900 - return 1;
901 -}
902 -
903 -static inline int hex(int v)
904 -{
905 - if (v < 10) return '0' + v;
906 - else return 'A' + v - 10;
907 -}
908 -
909 -static char *quote_ref_url(const char *base, const char *ref)
910 -{
911 - const char *cp;
912 - char *dp, *qref;
913 - int len, baselen, ch;
914 -
915 - baselen = strlen(base);
916 - len = baselen + 7; /* "/refs/" + NUL */
917 - for (cp = ref; (ch = *cp) != 0; cp++, len++)
918 - if (needs_quote(ch))
919 - len += 2; /* extra two hex plus replacement % */
920 - qref = xmalloc(len);
921 - memcpy(qref, base, baselen);
922 - memcpy(qref + baselen, "/refs/", 6);
923 - for (cp = ref, dp = qref + baselen + 6; (ch = *cp) != 0; cp++) {
924 - if (needs_quote(ch)) {
925 - *dp++ = '%';
926 - *dp++ = hex((ch >> 4) & 0xF);
927 - *dp++ = hex(ch & 0xF);
928 - }
929 - else
930 - *dp++ = ch;
931 - }
932 - *dp = 0;
933 -
934 - return qref;
935 -}
936 -
891 static int fetch_ref(struct walker *walker, char *ref, unsigned char *sha1)
892 {
939 - char *url;
940 - struct strbuf buffer = STRBUF_INIT;
893 struct walker_data *data = walker->data;
942 - const char *base = data->alt->base;
943 - struct active_request_slot *slot;
944 - struct slot_results results;
945 - int ret;
946 -
947 - url = quote_ref_url(base, ref);
948 - slot = get_active_slot();
949 - slot->results = &results;
950 - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
951 - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
952 - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
953 - curl_easy_setopt(slot->curl, CURLOPT_URL, url);
954 - if (start_active_slot(slot)) {
955 - run_active_slot(slot);
956 - if (results.curl_result == CURLE_OK) {
957 - strbuf_rtrim(&buffer);
958 - if (buffer.len == 40)
959 - ret = get_sha1_hex(buffer.buf, sha1);
960 - else
961 - ret = 1;
962 - } else {
963 - ret = error("Couldn't get %s for %s\n%s",
964 - url, ref, curl_errorstr);
965 - }
966 - } else {
967 - ret = error("Unable to start request");
968 - }
969 -
970 - strbuf_release(&buffer);
971 - free(url);
972 - return ret;
894 + return http_fetch_ref(data->alt->base, ref, sha1);
895 }
896
897 static void cleanup(struct walker *walker)
http.c
+82
@@ -552,3 +552,85 @@ void finish_all_active_slots(void)
552 slot = slot->next;
553 }
554 }
555 +
556 +static inline int needs_quote(int ch)
557 +{
558 + if (((ch >= 'A') && (ch <= 'Z'))
559 + || ((ch >= 'a') && (ch <= 'z'))
560 + || ((ch >= '0') && (ch <= '9'))
561 + || (ch == '/')
562 + || (ch == '-')
563 + || (ch == '.'))
564 + return 0;
565 + return 1;
566 +}
567 +
568 +static inline int hex(int v)
569 +{
570 + if (v < 10) return '0' + v;
571 + else return 'A' + v - 10;
572 +}
573 +
574 +static char *quote_ref_url(const char *base, const char *ref)
575 +{
576 + const char *cp;
577 + char *dp, *qref;
578 + int len, baselen, ch;
579 +
580 + baselen = strlen(base);
581 + len = baselen + 7; /* "/refs/" + NUL */
582 + for (cp = ref; (ch = *cp) != 0; cp++, len++)
583 + if (needs_quote(ch))
584 + len += 2; /* extra two hex plus replacement % */
585 + qref = xmalloc(len);
586 + memcpy(qref, base, baselen);
587 + memcpy(qref + baselen, "/refs/", 6);
588 + for (cp = ref, dp = qref + baselen + 6; (ch = *cp) != 0; cp++) {
589 + if (needs_quote(ch)) {
590 + *dp++ = '%';
591 + *dp++ = hex((ch >> 4) & 0xF);
592 + *dp++ = hex(ch & 0xF);
593 + }
594 + else
595 + *dp++ = ch;
596 + }
597 + *dp = 0;
598 +
599 + return qref;
600 +}
601 +
602 +int http_fetch_ref(const char *base, const char *ref, unsigned char *sha1)
603 +{
604 + char *url;
605 + struct strbuf buffer = STRBUF_INIT;
606 + struct active_request_slot *slot;
607 + struct slot_results results;
608 + int ret;
609 +
610 + url = quote_ref_url(base, ref);
611 + slot = get_active_slot();
612 + slot->results = &results;
613 + curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
614 + curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
615 + curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
616 + curl_easy_setopt(slot->curl, CURLOPT_URL, url);
617 + if (start_active_slot(slot)) {
618 + run_active_slot(slot);
619 + if (results.curl_result == CURLE_OK) {
620 + strbuf_rtrim(&buffer);
621 + if (buffer.len == 40)
622 + ret = get_sha1_hex(buffer.buf, sha1);
623 + else
624 + ret = 1;
625 + } else {
626 + ret = error("Couldn't get %s for %s\n%s",
627 + url, ref, curl_errorstr);
628 + }
629 + } else {
630 + ret = error("Unable to start request");
631 + }
632 +
633 + strbuf_release(&buffer);
634 + free(url);
635 + return ret;
636 +}
http.h
+2
@@ -96,4 +96,6 @@ static inline int missing__target(int code, int result)
96
97 #define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
98
99 +extern int http_fetch_ref(const char *base, const char *ref, unsigned char *sha1);
100 +
101 #endif /* HTTP_H */