Change size and dumping count types into size_t

This also requires changing a magic value triggering the infinite dump
mode from -1 into SIZE_MAX.

Change-Id: Ib033921ca72001de2570bf740383a8471e9cae35

diff --git a/include/logretrieve.h b/include/logretrieve.h
index 103dc07..144d4c4 100644 (file)
--- a/include/logretrieve.h
+++ b/include/logretrieve.h
@@ -6,8 +6,8 @@
 struct additional_options {
        list_head filter_list;
        log_filter *filter_object;
-       int logs_dump;
-       int logs_size;
+       size_t logs_dump;
+       size_t logs_size;
 };
 
 int additional_options_init(struct additional_options *opt);

diff --git a/include/sort_vector.h b/include/sort_vector.h
index 3e7cd12..de2c0fc 100644 (file)
--- a/include/sort_vector.h
+++ b/include/sort_vector.h
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+#include <limits.h>
+
 #include <logconfig.h>
 #include <log_file.h>
 #include <queued_entry.h>
@@ -23,7 +25,7 @@
 #define IS_VECTOR_SIZE_SORTABLE(x) (x > 1)
 
 #define DUMP_CONTINUOUS 0
-#define DUMP_INFINITE (-1)
+#define DUMP_INFINITE SIZE_MAX
 
 #define DEFAULT_SORT_BUFFER_SIZE 131072 // the size (in ENTRIES!) of the sorting buffer
 
@@ -31,9 +33,9 @@ struct sort_vector {
        struct logger_entry **data;
        int begin;
        int end;
-       int size;
+       size_t size;
        long timeout;
-       int dump;
+       size_t dump;
        enum sorting_order sort_by;
        bool old_logs_dumped;
        struct timespec start;  /* mark start to detect the moment when all "old" logs (existing before util has been invoked) have been dumped */

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index cfa0e00..3bfaa0f 100644 (file)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -116,7 +116,7 @@ int parse_options(int argc, char **argv, struct log_file *l_file, int *enabled_b
                        opt->logs_dump = DUMP_INFINITE;
                        break;
                case 't':
-                       if (sscanf(optarg, "%d", &opt->logs_dump) != 1)
+                       if (sscanf(optarg, "%zu", &opt->logs_dump) != 1)
                                err_arg_nondigit = 1;
                        break;
                case 'c':
@@ -135,7 +135,7 @@ int parse_options(int argc, char **argv, struct log_file *l_file, int *enabled_b
                        break;
                }
                case 'u':
-                       if (sscanf(optarg, "%d", &opt->logs_size) != 1)
+                       if (sscanf(optarg, "%zu", &opt->logs_size) != 1)
                                err_arg_nondigit = 1;
                        break;
                case 'f':