diff options
author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-08-25 16:20:58 +0200 |
---|---|---|
committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-08-25 16:20:58 +0200 |
commit | 87ca5dda058c8fe6548835b357fad9b93a106045 (patch) | |
tree | 5a47a16eb30bccbb9b73556e01924a161ceea501 | |
parent | df49fe93d7c50b8ac5053ec46ea8a0a19ce6308e (diff) | |
parent | 55ceb12b1372f945616f6b65bfac9bc936d317ca (diff) | |
download | abrt-87ca5dda058c8fe6548835b357fad9b93a106045.tar.gz abrt-87ca5dda058c8fe6548835b357fad9b93a106045.tar.xz abrt-87ca5dda058c8fe6548835b357fad9b93a106045.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
-rw-r--r-- | inc/abrtlib.h | 6 | ||||
-rw-r--r-- | lib/utils/Makefile.am | 2 | ||||
-rw-r--r-- | lib/utils/skip_whitespace.c (renamed from lib/utils/skip_whitespace.cpp) | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/inc/abrtlib.h b/inc/abrtlib.h index a111ce71..31c62bee 100644 --- a/inc/abrtlib.h +++ b/inc/abrtlib.h @@ -67,10 +67,6 @@ int vdprintf(int d, const char *format, va_list ap); #include "read_write.h" -char* skip_whitespace(const char *s); -char* skip_non_whitespace(const char *s); - - #ifdef __cplusplus extern "C" { #endif @@ -78,6 +74,8 @@ int prefixcmp(const char *str, const char *prefix); int suffixcmp(const char *str, const char *suffix); char *concat_path_file(const char *path, const char *filename); char *append_to_malloced_string(char *mstr, const char *append); +char* skip_whitespace(const char *s); +char* skip_non_whitespace(const char *s); #ifdef __cplusplus } #endif diff --git a/lib/utils/Makefile.am b/lib/utils/Makefile.am index d182e1a0..e1b41d65 100644 --- a/lib/utils/Makefile.am +++ b/lib/utils/Makefile.am @@ -18,7 +18,7 @@ libABRTUtils_la_SOURCES = \ logging.c logging.h \ copyfd.cpp \ daemon.cpp \ - skip_whitespace.cpp \ + skip_whitespace.c \ xatonum.cpp numtoa.cpp \ spawn.cpp \ stringops.cpp \ diff --git a/lib/utils/skip_whitespace.cpp b/lib/utils/skip_whitespace.c index 816928bf..816928bf 100644 --- a/lib/utils/skip_whitespace.cpp +++ b/lib/utils/skip_whitespace.c |