diff options
author | Allan McRae <allan@archlinux.org> | 2013-01-03 11:49:33 +0100 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-01-04 12:49:37 +0100 |
commit | 27d9c25ee2fd6a03fb1ec1afdfbe105048875bae (patch) | |
tree | c5f6739e5f72a153fb358b2702965c39352ef630 /src/pacman/util.h | |
parent | 965e1de2174148a7a6c0860a7514d9bb1969bf03 (diff) | |
download | pacman-27d9c25ee2fd6a03fb1ec1afdfbe105048875bae.tar.gz pacman-27d9c25ee2fd6a03fb1ec1afdfbe105048875bae.tar.xz |
Split common utility functions for libalpm and pacman
There is duplicated code in the util.c files in the libalpm and pacman
source code. Split this into a separate file so that it can be shared
via a symlink. This prevents code divergence between the two code bases.
Also, move mbasename and mdirname from pacman/util.c into util-common.c
in preparation for the following patch that uses them to add an extension
to pacsave files.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/util.h')
-rw-r--r-- | src/pacman/util.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/pacman/util.h b/src/pacman/util.h index 0c58a470..c38291a9 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -26,6 +26,8 @@ #include <alpm_list.h> +#include "util-common.h" + #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ @@ -49,8 +51,6 @@ int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); unsigned short getcols(int fd); int rmrf(const char *path); -const char *mbasename(const char *path); -char *mdirname(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); @@ -80,10 +80,6 @@ int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - #endif /* _PM_UTIL_H */ /* vim: set ts=2 sw=2 noet: */ |