Name it after what it does: s/extract_to_stdout/extract_to_stream/

git-svn-id: http://opkg.googlecode.com/svn/trunk@388 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libbb/libbb.h b/libbb/libbb.h
index 06659212936b4b74e766853339c4e8e66e760b77..2c9f2f1258d78b1ea829282b1f6e1b4290219047 100644 (file)
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -81,7 +81,7 @@ enum extract_functions_e {
        extract_verbose_list = 1,
        extract_list = 2,
        extract_one_to_buffer = 4,
        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,
        extract_all_to_fs = 16,
        extract_preserve_date = 32,
        extract_data_tar_gz = 64,

diff --git a/libbb/unarchive.c b/libbb/unarchive.c
index 8f82a10f7f8f3373ffb548357917d73a3be63749..9517e46c8e669a0bb4ca2d50000a2448ddd33415 100644 (file)
--- a/libbb/unarchive.c
+++ b/libbb/unarchive.c
@@ -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;
                if (S_ISREG(file_entry->mode)) {
                        copy_file_chunk(src_stream, out_stream, file_entry->size);                      
                        archive_offset += file_entry->size;

diff --git a/libopkg/pkg_extract.c b/libopkg/pkg_extract.c
index d9fbdd5f6d7b69479483885e307b192a2549596d..d8b06a6c7827f335bd35f41724086cc5fc57f774 100644 (file)
--- a/libopkg/pkg_extract.c
+++ b/libopkg/pkg_extract.c
@@ -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
 {
     deb_extract(pkg->local_filename, stream,
                               extract_control_tar_gz

-                              | extract_to_stdout, /* to stream actually */
+                              | extract_to_stream,

                               NULL, "./control");
 
     return 0;
                               NULL, "./control");
 
     return 0;