[Winpt-commits] r138 - trunk/Src

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2006-01-09 15:20:00 +0100 (Mon, 09 Jan 2006)
New Revision: 138

Modified:
   trunk/Src/wptGPG.cpp
Log:
Do not overwrite default return value.



Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp	2006-01-09 14:01:51 UTC (rev 137)
+++ trunk/Src/wptGPG.cpp	2006-01-09 14:20:00 UTC (rev 138)
@@ -364,10 +364,9 @@
     int rc = 1;
 
     /* Convert the needed GPG version to the integer format. */
-    rc = parse_version_nr (need_gpg_ver, 
-			   &need_major, &need_minor, &need_patch);
-    if (rc)
-	return rc;
+    if (parse_version_nr (need_gpg_ver, 
+			  &need_major, &need_minor, &need_patch))
+	return 1;
     
     gpgme_new (&ctx);
     inf = gpgme_ctx_get_engine_info (ctx);
@@ -382,10 +381,9 @@
     if (strstr (eng, "IDEA"))
 	idea_available = 1;
     free (eng);
-    rc = parse_version_nr (inf->version, &major, &minor, &patch);
-    if (rc) {
+    if (parse_version_nr (inf->version, &major, &minor, &patch)) {
 	gpgme_release (ctx);
-	return rc;
+	return 1;
     }
 
     if (major > need_major)