mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
credential-store: move related functions to credential-store file
is_rfc3986_unreserved() and is_rfc3986_reserved_or_unreserved() are only called from builtin/credential-store.c and they are only relevant to that file so move those functions and make them static. Signed-off-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5d1344b497
commit
f89854362c
|
@ -74,6 +74,25 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
|
|||
die_errno("unable to write credential store");
|
||||
}
|
||||
|
||||
static int is_rfc3986_unreserved(char ch)
|
||||
{
|
||||
return isalnum(ch) ||
|
||||
ch == '-' || ch == '_' || ch == '.' || ch == '~';
|
||||
}
|
||||
|
||||
static int is_rfc3986_reserved_or_unreserved(char ch)
|
||||
{
|
||||
if (is_rfc3986_unreserved(ch))
|
||||
return 1;
|
||||
switch (ch) {
|
||||
case '!': case '*': case '\'': case '(': case ')': case ';':
|
||||
case ':': case '@': case '&': case '=': case '+': case '$':
|
||||
case ',': case '/': case '?': case '#': case '[': case ']':
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void store_credential_file(const char *fn, struct credential *c)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
|
19
strbuf.c
19
strbuf.c
|
@ -810,25 +810,6 @@ void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s)
|
|||
}
|
||||
}
|
||||
|
||||
int is_rfc3986_reserved_or_unreserved(char ch)
|
||||
{
|
||||
if (is_rfc3986_unreserved(ch))
|
||||
return 1;
|
||||
switch (ch) {
|
||||
case '!': case '*': case '\'': case '(': case ')': case ';':
|
||||
case ':': case '@': case '&': case '=': case '+': case '$':
|
||||
case ',': case '/': case '?': case '#': case '[': case ']':
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int is_rfc3986_unreserved(char ch)
|
||||
{
|
||||
return isalnum(ch) ||
|
||||
ch == '-' || ch == '_' || ch == '.' || ch == '~';
|
||||
}
|
||||
|
||||
static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
|
||||
char_predicate allow_unencoded_fn)
|
||||
{
|
||||
|
|
3
strbuf.h
3
strbuf.h
|
@ -690,9 +690,6 @@ int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
|
|||
|
||||
typedef int (*char_predicate)(char ch);
|
||||
|
||||
int is_rfc3986_unreserved(char ch);
|
||||
int is_rfc3986_reserved_or_unreserved(char ch);
|
||||
|
||||
void strbuf_addstr_urlencode(struct strbuf *sb, const char *name,
|
||||
char_predicate allow_unencoded_fn);
|
||||
|
||||
|
|
Loading…
Reference in a new issue