The following commit has been merged in the master branch:
commit 7a0a0619fd3c926aecec59987597a40f7b2dcd3c
Author: Guillem Jover <[email protected]>
Date: Mon Nov 1 08:31:48 2010 +0100
libdpkg: Rename path_rtrim_slash_slashdot to path_trim_slash_slashdot
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index d993bd7..59474b9 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -246,7 +246,7 @@ void do_build(const char *const *argv) {
} else {
m= m_malloc(strlen(directory) + sizeof(DEBEXT));
strcpy(m, directory);
- path_rtrim_slash_slashdot(m);
+ path_trim_slash_slashdot(m);
strcat(m, DEBEXT);
debar= m;
}
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index e5b6a5c..92ab7d5 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -64,8 +64,8 @@ LIBDPKG_PRIVATE {
varbuf_destroy;
# Path, directory and file functions
- path_rtrim_slash_slashdot;
path_skip_slash_dotslash;
+ path_trim_slash_slashdot;
path_make_temp_template;
path_quote_filename;
diff --git a/lib/dpkg/path.c b/lib/dpkg/path.c
index 1dd736b..001ec2b 100644
--- a/lib/dpkg/path.c
+++ b/lib/dpkg/path.c
@@ -40,7 +40,7 @@
* @return The size of the trimmed pathname.
*/
size_t
-path_rtrim_slash_slashdot(char *path)
+path_trim_slash_slashdot(char *path)
{
char *end;
diff --git a/lib/dpkg/path.h b/lib/dpkg/path.h
index 3543541..52d91a6 100644
--- a/lib/dpkg/path.h
+++ b/lib/dpkg/path.h
@@ -27,7 +27,7 @@
DPKG_BEGIN_DECLS
-size_t path_rtrim_slash_slashdot(char *path);
+size_t path_trim_slash_slashdot(char *path);
const char *path_skip_slash_dotslash(const char *path);
char *path_quote_filename(char *dst, const char *src, size_t size);
diff --git a/lib/dpkg/test/t-path.c b/lib/dpkg/test/t-path.c
index a3bf784..32e79ed 100644
--- a/lib/dpkg/test/t-path.c
+++ b/lib/dpkg/test/t-path.c
@@ -33,13 +33,13 @@
#define test_trim_eq_ref(p, ref) \
do { \
char *t = strdup((p)); \
- path_rtrim_slash_slashdot(t); \
+ path_trim_slash_slashdot(t); \
test_str(t, ==, (ref)); \
free(t); \
} while (0)
static void
-test_path_rtrim(void)
+test_path_trim(void)
{
test_trim_eq_ref("./././.", ".");
test_trim_eq_ref("./././", ".");
@@ -160,7 +160,7 @@ test_path_quote(void)
static void
test(void)
{
- test_path_rtrim();
+ test_path_trim();
test_path_skip();
test_path_temp();
test_path_quote();
diff --git a/src/querycmd.c b/src/querycmd.c
index 74bdabb..3c91e87 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -282,7 +282,7 @@ searchfiles(const char *const *argv)
varbufaddstr(&path, thisarg);
varbufaddc(&path, '\0');
- varbuf_trunc(&path, path_rtrim_slash_slashdot(path.buf));
+ varbuf_trunc(&path, path_trim_slash_slashdot(path.buf));
thisarg = path.buf;
}
diff --git a/src/statcmd.c b/src/statcmd.c
index aed928f..6878589 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -110,7 +110,7 @@ path_cleanup(const char *path)
{
char *new_path = m_strdup(path);
- path_rtrim_slash_slashdot(new_path);
+ path_trim_slash_slashdot(new_path);
if (opt_verbose && strcmp(path, new_path) != 0)
warning(_("stripping trailing /"));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
