libdpkg: Rename compress_type_cat to compress_type_none

dpkg-deb/build.c

@@ -549,7 +549,7 @@ void do_build(const char *const *argv) {
     case compress_type_lzma:
       datamember = DATAMEMBER_LZMA;
       break;
-    case compress_type_cat:
+    case compress_type_none:
       datamember = DATAMEMBER;
       break;
     default:

dpkg-deb/extract.c

@@ -187,7 +187,7 @@ void extracthalf(const char *debar, const char *directory,
 	    compress_type = compress_type_lzma;
 	  } else if (strncmp(arh.ar_name, DATAMEMBER, sizeof(arh.ar_name)) == 0) {
 	    adminmember= 0;
-	    compress_type = compress_type_cat;
+	    compress_type = compress_type_none;
 	  } else {
             ohshit(_("file `%.250s' contains ununderstood data member %.*s, giving up"),
                    debar, (int)sizeof(arh.ar_name), arh.ar_name);

dpkg-deb/main.c

@@ -200,7 +200,7 @@ static void setcompresstype(const struct cmdinfo *cip, const char *value) {
   else if (!strcmp(value, "lzma"))
     compress_type = compress_type_lzma;
   else if (!strcmp(value, "none"))
-    compress_type = compress_type_cat;
+    compress_type = compress_type_none;
   else
     ohshit(_("unknown compression type `%s'!"), value);
 }

lib/dpkg/compress.c

@@ -143,7 +143,7 @@ decompress_cat(enum compress_type type, int fd_in, int fd_out,
 #endif
     case compress_type_lzma:
       fd_fd_filter(fd_in, fd_out, v.buf, LZMA, "-dc", NULL);
-    case compress_type_cat:
+    case compress_type_none:
       fd_fd_copy(fd_in, fd_out, -1, _("%s: decompression"), v.buf);
       exit(0);
     default:
@@ -165,7 +165,7 @@ compress_cat(enum compress_type type, int fd_in, int fd_out,
 
   if(compression == NULL) compression= "9";
   else if (*compression == '0')
-    type = compress_type_cat;
+    type = compress_type_none;
 
   switch(type) {
     case compress_type_gzip:
@@ -239,7 +239,7 @@ compress_cat(enum compress_type type, int fd_in, int fd_out,
     case compress_type_lzma:
       snprintf(combuf, sizeof(combuf), "-c%c", *compression);
       fd_fd_filter(fd_in, fd_out, v.buf, LZMA, combuf, NULL);
-    case compress_type_cat:
+    case compress_type_none:
       fd_fd_copy(fd_in, fd_out, -1, _("%s: compression"), v.buf);
       exit(0);
     default:

lib/dpkg/compress.h

@@ -31,7 +31,7 @@ DPKG_BEGIN_DECLS
 #define LZMA		"lzma"
 
 enum compress_type {
-  compress_type_cat,
+  compress_type_none,
   compress_type_gzip,
   compress_type_bzip2,
   compress_type_lzma,