remove some more vestiges of cvs

svn:r8229
This commit is contained in:
Roger Dingledine 2006-08-26 06:51:02 +00:00
parent da7ed996e2
commit c0cb1c7bd2
2 changed files with 4 additions and 4 deletions

View file

@ -391,7 +391,7 @@ static int or_state_validate(or_state_t *old_options, or_state_t *options,
static uint64_t config_parse_memunit(const char *s, int *ok);
static int config_parse_interval(const char *s, int *ok);
static void print_cvs_version(void);
static void print_svn_version(void);
static void init_libevent(void);
static int opt_streq(const char *s1, const char *s2);
typedef enum {
@ -2712,7 +2712,7 @@ options_init_from_torrc(int argc, char **argv)
if (argc > 1 && (!strcmp(argv[1],"--version"))) {
printf("Tor version %s.\n",VERSION);
if (argc > 2 && (!strcmp(argv[2],"--version"))) {
print_cvs_version();
print_svn_version();
}
exit(0);
}
@ -4013,7 +4013,7 @@ extern const char routerparse_c_id[];
/** Dump the version of every file to the log. */
static void
print_cvs_version(void)
print_svn_version(void)
{
puts(AES_H_ID);
puts(COMPAT_H_ID);

View file

@ -1852,7 +1852,7 @@ tor_version_parse(const char *s, tor_version_t *out)
if (!eos || eos==cp) return -1;
cp = eos;
/* Get cvs status and status tag. */
/* Get status tag. */
if (*cp == '-' || *cp == '.')
++cp;
strlcpy(out->status_tag, cp, sizeof(out->status_tag));