diff options
author | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-04-05 10:39:33 +0200 |
---|---|---|
committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-04-05 10:39:33 +0200 |
commit | c1169b2a8292db34d99c327c6aeb315116cf0e00 (patch) | |
tree | 14cae822bfa85352c37d21e30057dba3e7078546 /src/cli | |
parent | 98445ec1f011601cfe650ef9a36bdada6cb058cb (diff) | |
parent | 90fe3a9d0cd766d18d1142d8d6981193a5715643 (diff) | |
download | abrt-c1169b2a8292db34d99c327c6aeb315116cf0e00.tar.gz abrt-c1169b2a8292db34d99c327c6aeb315116cf0e00.tar.xz abrt-c1169b2a8292db34d99c327c6aeb315116cf0e00.zip |
Merge branch 'daemon/blacklist'
* daemon/blacklist:
rhbz#692465 - Blacklist doesn't work
Diffstat (limited to 'src/cli')
-rw-r--r-- | src/cli/report.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/cli/report.cpp b/src/cli/report.cpp index 172cb8f8..e2873a28 100644 --- a/src/cli/report.cpp +++ b/src/cli/report.cpp @@ -23,29 +23,6 @@ #define FIELD_SEP "%----" /* - * Trims whitespace characters both from left and right side of a string. - * Modifies the string in-place. Returns the trimmed string. - */ -static char *trim(char *str) -{ - if (!str) - return NULL; - - // Remove leading spaces. - overlapping_strcpy(str, skip_whitespace(str)); - - // Remove trailing spaces. - int i = strlen(str); - while (--i >= 0) - { - if (!isspace(str[i])) - break; - } - str[++i] = '\0'; - return str; -} - -/* * Escapes the field content string to avoid confusion with file comments. * Returned field must be free()d by caller. */ @@ -226,11 +203,11 @@ static int read_crash_report_field(const char *text, crash_data_t *report, char newvalue[length + 1]; strncpy(newvalue, textfield, length); newvalue[length] = '\0'; - trim(newvalue); + strtrim(newvalue); char oldvalue[strlen(value->content) + 1]; strcpy(oldvalue, value->content); - trim(oldvalue); + strtrim(oldvalue); // Return if no change in the contents detected. if (strcmp(newvalue, oldvalue) == 0) |