Browse Source

dpkg-deb: Rename DATAMEMBER_CAT to DATAMEMBER

Guillem Jover 16 years ago
parent
commit
3ad109046c
3 changed files with 3 additions and 3 deletions
  1. 1 1
      dpkg-deb/build.c
  2. 1 1
      dpkg-deb/dpkg-deb.h
  3. 1 1
      dpkg-deb/extract.c

+ 1 - 1
dpkg-deb/build.c

@@ -550,7 +550,7 @@ void do_build(const char *const *argv) {
       datamember = DATAMEMBER_LZMA;
       break;
     case compress_type_cat:
-      datamember = DATAMEMBER_CAT;
+      datamember = DATAMEMBER;
       break;
     default:
       internerr("unknown compress_type '%i'", compress_type);

+ 1 - 1
dpkg-deb/dpkg-deb.h

@@ -57,7 +57,7 @@ extern enum compress_type compress_type;
 #define DATAMEMBER_GZ		"data.tar.gz"
 #define DATAMEMBER_BZ2		"data.tar.bz2"
 #define DATAMEMBER_LZMA		"data.tar.lzma"
-#define DATAMEMBER_CAT		"data.tar"
+#define DATAMEMBER		"data.tar"
 
 #define MAXFILENAME 2048
 #define MAXFIELDNAME 200

+ 1 - 1
dpkg-deb/extract.c

@@ -185,7 +185,7 @@ void extracthalf(const char *debar, const char *directory,
 	  } else if (strncmp(arh.ar_name, DATAMEMBER_LZMA, sizeof(arh.ar_name)) == 0) {
 	    adminmember = 0;
 	    compress_type = compress_type_lzma;
-	  } else if (strncmp(arh.ar_name, DATAMEMBER_CAT, sizeof(arh.ar_name)) == 0) {
+	  } else if (strncmp(arh.ar_name, DATAMEMBER, sizeof(arh.ar_name)) == 0) {
 	    adminmember= 0;
 	    compress_type = compress_type_cat;
 	  } else {