Name it after what it does: s/extract_to_stdout/extract_to_stream/
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Fri, 27 Nov 2009 00:41:18 +0000 (00:41 +0000)
committergraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Fri, 27 Nov 2009 00:41:18 +0000 (00:41 +0000)
git-svn-id: http://opkg.googlecode.com/svn/trunk@388 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

libbb/libbb.h
libbb/unarchive.c
libopkg/pkg_extract.c

index 0665921..2c9f2f1 100644 (file)
@@ -81,7 +81,7 @@ enum extract_functions_e {
        extract_verbose_list = 1,
        extract_list = 2,
        extract_one_to_buffer = 4,
-       extract_to_stdout = 8,
+       extract_to_stream = 8,
        extract_all_to_fs = 16,
        extract_preserve_date = 32,
        extract_data_tar_gz = 64,
index 8f82a10..9517e46 100644 (file)
@@ -121,7 +121,7 @@ extract_archive(FILE *src_stream, FILE *out_stream,
        }
 
 
-       if (function & extract_to_stdout) {
+       if (function & extract_to_stream) {
                if (S_ISREG(file_entry->mode)) {
                        copy_file_chunk(src_stream, out_stream, file_entry->size);                      
                        archive_offset += file_entry->size;
index d9fbdd5..d8b06a6 100644 (file)
@@ -31,7 +31,7 @@ int pkg_extract_control_file_to_stream(pkg_t *pkg, FILE *stream)
 {
     deb_extract(pkg->local_filename, stream,
                               extract_control_tar_gz
-                              | extract_to_stdout, /* to stream actually */
+                              | extract_to_stream,
                               NULL, "./control");
 
     return 0;