873cd28a8b
The name "argv-array" isn't very good, because it describes what the
data type can be used for (program argument arrays), not what it
actually is (a dynamically-growing string array that maintains a
NULL-terminator invariant). This leads to people being hesitant to use
it for other cases where it would actually be a good fit. The existing
name is also clunky to use. It's overly long, and the name often leads
to saying things like "argv.argv" (i.e., the field names overlap with
variable names, since they're describing the use, not the type). Let's
give it a more neutral name.
I settled on "strvec" because "vector" is the name for a dynamic array
type in many programming languages. "strarray" would work, too, but it's
longer and a bit more awkward to say (and don't we all say these things
in our mind as we type them?).
A more extreme direction would be a generic data structure which stores
a NULL-terminated of _any_ type. That would be easy to do with void
pointers, but we'd lose some type safety for the existing cases. Plus it
raises questions about memory allocation and ownership. So I limited
myself here to changing names only, and not semantics. If we do find a
use for that more generic data type, we could perhaps implement it at a
lower level and then provide type-safe wrappers around it for strings.
But that can come later.
This patch does the minimum to convert the struct and function names in
the header and implementation, leaving a few things for follow-on
patches:
- files retain their original names for now
- struct field names are retained for now
- there's a preprocessor compat layer that lets most users remain the
same for now. The exception is headers which made a manual forward
declaration of the struct. I've converted them (and their dependent
function declarations) here.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
2.1 KiB
C
72 lines
2.1 KiB
C
#ifndef REFSPEC_H
|
|
#define REFSPEC_H
|
|
|
|
#define TAG_REFSPEC "refs/tags/*:refs/tags/*"
|
|
extern const struct refspec_item *tag_refspec;
|
|
|
|
struct refspec_item {
|
|
unsigned force : 1;
|
|
unsigned pattern : 1;
|
|
unsigned matching : 1;
|
|
unsigned exact_sha1 : 1;
|
|
|
|
char *src;
|
|
char *dst;
|
|
};
|
|
|
|
#define REFSPEC_FETCH 1
|
|
#define REFSPEC_PUSH 0
|
|
|
|
#define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH }
|
|
#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
|
|
|
|
/**
|
|
* A struct refspec holds the parsed interpretation of a refspec. If it will
|
|
* force updates (starts with a '+'), force is true. If it is a pattern
|
|
* (sides end with '*') pattern is true. src and dest are the two sides
|
|
* (including '*' characters if present); if there is only one side, it is src,
|
|
* and dst is NULL; if sides exist but are empty (i.e., the refspec either
|
|
* starts or ends with ':'), the corresponding side is "".
|
|
*
|
|
* An array of strings can be parsed into an array of struct refspecs using
|
|
* parse_fetch_refspec() or parse_push_refspec().
|
|
*
|
|
* remote_find_tracking(), given a remote and a struct refspec with either src
|
|
* or dst filled out, will fill out the other such that the result is in the
|
|
* "fetch" specification for the remote (note that this evaluates patterns and
|
|
* returns a single result).
|
|
*/
|
|
struct refspec {
|
|
struct refspec_item *items;
|
|
int alloc;
|
|
int nr;
|
|
|
|
const char **raw;
|
|
int raw_alloc;
|
|
int raw_nr;
|
|
|
|
int fetch;
|
|
};
|
|
|
|
int refspec_item_init(struct refspec_item *item, const char *refspec,
|
|
int fetch);
|
|
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
|
|
int fetch);
|
|
void refspec_item_clear(struct refspec_item *item);
|
|
void refspec_init(struct refspec *rs, int fetch);
|
|
void refspec_append(struct refspec *rs, const char *refspec);
|
|
void refspec_appendn(struct refspec *rs, const char **refspecs, int nr);
|
|
void refspec_clear(struct refspec *rs);
|
|
|
|
int valid_fetch_refspec(const char *refspec);
|
|
|
|
struct strvec;
|
|
/*
|
|
* Determine what <prefix> values to pass to the peer in ref-prefix lines
|
|
* (see Documentation/technical/protocol-v2.txt).
|
|
*/
|
|
void refspec_ref_prefixes(const struct refspec *rs,
|
|
struct strvec *ref_prefixes);
|
|
|
|
#endif /* REFSPEC_H */
|