diff options
| author | Werner Koch <wk@gnupg.org> | 2011-02-21 17:04:46 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-02-21 17:04:46 +0100 |
| commit | 2442ca23030c8900c907166ca3f5d31d1907ead8 (patch) | |
| tree | 345ea4d6ecda4b39616fae2e93ccac8939bdbd71 /src/global.c | |
| parent | 61a521277c6347e99fec8b6575271f705360d802 (diff) | |
| download | libgcrypt-2442ca23030c8900c907166ca3f5d31d1907ead8.tar.gz | |
Final changes for 1.5.0-beta1
Diffstat (limited to 'src/global.c')
| -rw-r--r-- | src/global.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/global.c b/src/global.c index 6336fea2..51d7f396 100644 --- a/src/global.c +++ b/src/global.c @@ -234,7 +234,7 @@ gcry_check_version( const char *req_version ) const char *ver = VERSION; int my_major, my_minor, my_micro; int rq_major, rq_minor, rq_micro; - const char *my_plvl, *rq_plvl; + const char *my_plvl; /* Initialize library. */ global_init (); @@ -250,23 +250,19 @@ gcry_check_version( const char *req_version ) assert() here and bail out in case this happens? -mo. */ return NULL; - /* Parse requested version number. */ - rq_plvl = parse_version_string( req_version, &rq_major, &rq_minor, - &rq_micro ); - if ( !rq_plvl ) - /* req version string is invalid, this can happen. */ - return NULL; + /* Parse requested version number. */ + if (!parse_version_string (req_version, &rq_major, &rq_minor, &rq_micro)) + return NULL; /* req version string is invalid, this can happen. */ /* Compare version numbers. */ if ( my_major > rq_major || (my_major == rq_major && my_minor > rq_minor) + || (my_major == rq_major && my_minor == rq_minor && my_micro > rq_micro) || (my_major == rq_major && my_minor == rq_minor - && my_micro > rq_micro) - || (my_major == rq_major && my_minor == rq_minor - && my_micro == rq_micro - && strcmp( my_plvl, rq_plvl ) >= 0) ) { + && my_micro == rq_micro)) + { return ver; - } + } return NULL; } |