diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
| commit | acead5b93cf49ab33cba4be2ea8e1b253ed0f2bf (patch) | |
| tree | 7c8631716d2182c7891533a0e4ce3b6962595f17 /test/interactive-helper | |
| parent | f4a631adf2f14c99d61ecb7f61cb1b3625c1cde4 (diff) | |
| parent | bae81c1307e956aa8928c9d6a77830fb733cd61f (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'test/interactive-helper')
| -rw-r--r-- | test/interactive-helper/rpmver.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/interactive-helper/rpmver.cc b/test/interactive-helper/rpmver.cc index 9fc807de8..15c96cbbe 100644 --- a/test/interactive-helper/rpmver.cc +++ b/test/interactive-helper/rpmver.cc @@ -2,6 +2,7 @@ #include <rpm/rpmio.h> #include <rpm/misc.h> #include <stdlib.h> +#include <stdio.h> #include <ctype.h> #define xisdigit(x) isdigit(x) @@ -12,10 +13,8 @@ using namespace std; int rpmvercmp(const char * a, const char * b) { - char oldch1, oldch2; char * str1, * str2; char * one, * two; - int rc; int isnum; /* easy comparison to see if versions are identical */ @@ -53,9 +52,9 @@ int rpmvercmp(const char * a, const char * b) /* save character at the end of the alpha or numeric segment */ /* so that they can be restored after the comparison */ - oldch1 = *str1; + char oldch1 = *str1; *str1 = '\0'; - oldch2 = *str2; + char oldch2 = *str2; *str2 = '\0'; /* take care of the case where the two version segments are */ @@ -81,7 +80,7 @@ int rpmvercmp(const char * a, const char * b) /* segments are alpha or if they are numeric. don't return */ /* if they are equal because there might be more segments to */ /* compare */ - rc = strcmp(one, two); + int rc = strcmp(one, two); if (rc) return rc; /* restore character that was replaced by null above */ |