diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-07-25 04:34:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-07-25 04:34:14 +0000 |
| commit | 96bcbb1e1c7e8246d1d93c628c587d2511ce315a (patch) | |
| tree | 1e5cca50f30a26f9155a3bf0f554f37ebb477ccd /src/or/routerparse.c | |
| parent | 8d2a71a47aea445cfbe4d4fed75520d1924b71ab (diff) | |
| download | tor-96bcbb1e1c7e8246d1d93c628c587d2511ce315a.tar.gz tor-96bcbb1e1c7e8246d1d93c628c587d2511ce315a.zip | |
Remove code to special-case "-cvs" ending, since it has not actually mattered since 0.0.9. Perhaps we can special-case even more...
svn:r6898
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b1dd2e30dc..ebcff84866 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1803,7 +1803,7 @@ tor_version_parse(const char *s, tor_version_t *out) { char *eos=NULL, *cp=NULL; /* Format is: - * "Tor " ? NUM dot NUM dot NUM [ ( pre | rc | dot ) NUM [ -cvs ] ] + * "Tor " ? NUM dot NUM dot NUM [ ( pre | rc | dot ) NUM [ - tag ] ] */ tor_assert(s); tor_assert(out); @@ -1829,7 +1829,6 @@ tor_version_parse(const char *s, tor_version_t *out) if (!*eos) { out->status = VER_RELEASE; out->patchlevel = 0; - out->cvs = IS_NOT_CVS; return 0; } cp = eos; @@ -1857,11 +1856,6 @@ tor_version_parse(const char *s, tor_version_t *out) if (*cp == '-' || *cp == '.') ++cp; strlcpy(out->status_tag, cp, sizeof(out->status_tag)); - if (0==strcmp(cp, "cvs")) { - out->cvs = IS_CVS; - } else { - out->cvs = IS_NOT_CVS; - } return 0; } @@ -1885,11 +1879,7 @@ tor_version_compare(tor_version_t *a, tor_version_t *b) else if ((i = a->patchlevel - b->patchlevel)) return i; - if (a->major > 0 || a->minor > 0) { - return strcmp(a->status_tag, b->status_tag); - } else { - return (a->cvs - b->cvs); - } + return strcmp(a->status_tag, b->status_tag); } /** Return true iff versions <b>a</b> and <b>b</b> belong to the same series. |