summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-12-23 14:33:26 -0600
committerDan McGee <dan@archlinux.org>2011-12-23 14:37:03 -0600
commitaac639351f1eb56c1f8f6f19bfe438400a02c614 (patch)
tree12a57b35ea0816d44cdff387ce186c675b1a0eec
parenta7cb1509317e929043df973a9814145fecc99513 (diff)
downloadpacman-aac639351f1eb56c1f8f6f19bfe438400a02c614.tar.xz
Remove strtrim function from backend
The last user of this was the code in the backend for loading packages, but this no longer uses it. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/util.c41
-rw-r--r--lib/libalpm/util.h1
2 files changed, 0 insertions, 42 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 2e3f765a..fc0e0564 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -188,47 +188,6 @@ cleanup:
return ret;
}
-/** Trim leading and trailing whitespace, including newlines, from a string.
- * Modifies str in place.
- * @param str a string to trim
- * @return str
- */
-char *_alpm_strtrim(char *str)
-{
- char *pch = str;
-
- if(*str == '\0') {
- /* string is empty, so we're done. */
- return str;
- }
-
- while(isspace((unsigned char)*pch)) {
- pch++;
- }
- if(pch != str) {
- size_t len = strlen(pch);
- if(len) {
- /* move the remaining string to the beginning of str */
- memmove(str, pch, len + 1);
- } else {
- *str = '\0';
- }
- }
-
- /* check if there wasn't anything but whitespace in the string. */
- if(*str == '\0') {
- return str;
- }
-
- pch = (str + (strlen(str) - 1));
- while(isspace((unsigned char)*pch)) {
- pch--;
- }
- *++pch = '\0';
-
- return str;
-}
-
/** Trim trailing newlines from a string (if any exist).
* @param str a single line of text
* @return the length of the trimmed string
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 54e69c19..6d5c0c35 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -113,7 +113,6 @@ enum _alpm_csum {
int _alpm_makepath(const char *path);
int _alpm_makepath_mode(const char *path, mode_t mode);
int _alpm_copyfile(const char *src, const char *dest);
-char *_alpm_strtrim(char *str);
size_t _alpm_strip_newline(char *str);
int _alpm_open_archive(alpm_handle_t *handle, const char *path,