libdpkg: Move skip_slash_dotslash from parsehelp.c to path.c

And from dpkg-db.h dpkg-priv.h.

diff --git a/ChangeLog b/ChangeLog
index 18d13f33ea8d15b15978787385cdd7a5bd431cfd..0f86deae767443deae1da183a0bb90f6cda51346 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-28  Guillem Jover  <guillem@debian.org>
+
+       * lib/dpkg-db.h (skip_slash_dotslash): Move declaration ...
+       * lib/dpkg-priv.h: ... here.
+       * lib/parsehelp.c (skip_slash_dotslash): Move definition ...
+       * lib/path.c: ... here.
+       * lib/fields.c: Include <dpkg-priv.h>.
+       * src/filesdb.c: Likewise.
+
 2008-06-28  Guillem Jover  <guillem@debian.org>
 
        * lib/dpkg.h (onerr_abort): Move declaration to the ehandle.c section.

diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index d92ab5d85809d130d6b06292a3fd7d99534b1765..ba74c2320838bdfb1cb06f3325003e6a8cfd10f1 100644 (file)
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -351,8 +351,6 @@ extern const struct namevalue statusinfos[];
 extern const struct namevalue eflaginfos[];
 extern const struct namevalue wantinfos[];
 
-const char *skip_slash_dotslash(const char *p);
-
 int informativeversion(const struct versionrevision *version);
 
 enum versiondisplayepochwhen { vdew_never, vdew_nonambig, vdew_always };

diff --git a/lib/dpkg-priv.h b/lib/dpkg-priv.h
index 493199a1a5f4c205eb68151acba207dffed16e3a..9e690f15914ff3aef83feecbf33916b8139a2a5d 100644 (file)
--- a/lib/dpkg-priv.h
+++ b/lib/dpkg-priv.h
@@ -35,6 +35,7 @@ extern "C" {
 /* Path handling. */
 
 size_t rtrim_slash_slashdot(char *path);
+const char *skip_slash_dotslash(const char *path);
 
 /* Subprocess handling. */
 

diff --git a/lib/fields.c b/lib/fields.c
index da2f253e9560ed82348fa7f8dfca365a905b09b4..fb90a12f3880176a7e124d86fcba6a72bf96c8c4 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -27,6 +27,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 #include "parsedump.h"
 
 static int convert_string

diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 4c823a947e622a3edc879566c10591f4540dd390..3b6a4bff55cf0ccf3af89a68221f1630bf62a233 100644 (file)
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -245,7 +245,3 @@ void parsemustfield
   }
 }
 
-const char *skip_slash_dotslash(const char *p) {
-  while (p[0] == '/' || (p[0] == '.' && p[1] == '/')) p++;
-  return p;
-}

diff --git a/lib/path.c b/lib/path.c
index ee8e6a5e4a799573ad572a19698162b6877ac88b..5f2a46ee0b6c2fed6836846e814e4c97a4fcf0d3 100644 (file)
--- a/lib/path.c
+++ b/lib/path.c
@@ -2,6 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * path.c - path handling functions
  *
+ * Copyright (C) 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright (C) 2008 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
@@ -41,3 +42,12 @@ rtrim_slash_slashdot(char *path)
        return end - path + 1;
 }
 
+const char *
+skip_slash_dotslash(const char *path)
+{
+       while (path[0] == '/' || (path[0] == '.' && path[1] == '/'))
+               path++;
+
+       return path;
+}
+

diff --git a/src/filesdb.c b/src/filesdb.c
index 97fe7673ee3b247014d5d2a972df49231a0383b8..7ecdae5b8909ea01827b8c328c2e0503fa324483 100644 (file)
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -34,6 +34,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 
 #include "filesdb.h"
 #include "main.h"