prune: use 'size_t' for size variables

This squashes some warnings on Windows and 32-bit platforms:

  generic_list.c(25,28): warning C4244: 'function': conversion from 'uint64_t'
    to 'size_t', possible loss of data
  generic_list.c(47,56): warning C4244: 'function': conversion from 'uint64_t'
    to 'size_t', possible loss of data
  generic_list.c(47,66): warning C4244: 'function': conversion from 'uint64_t'
    to 'size_t', possible loss of data

diff --git a/contrib/prune/generic_list.c b/contrib/prune/generic_list.c
index 3707c3608bd92f0c1d980c66197fc5817afcc2db..5b63244693061cca26606e8f9b1da667adf86083 100644 (file)
--- a/contrib/prune/generic_list.c
+++ b/contrib/prune/generic_list.c
@@ -10,14 +10,12 @@
 
 #include <cgraph/alloc.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "generic_list.h"
 
 #define DFLT_SIZE 100
 
-generic_list_t new_generic_list(uint64_t size)
-{
+generic_list_t new_generic_list(size_t size) {
     generic_list_t list = {0};
     if (size != 0) {
        list.data = gv_calloc(size, sizeof(gl_data));
@@ -34,7 +32,7 @@ void free_generic_list(generic_list_t * list)
 }
 
 void add_to_generic_list(generic_list_t *list, gl_data element) {
-    uint64_t new_size;
+    size_t new_size;
 
     if (list->size == list->used) {
        if (list->size == 0) {

diff --git a/contrib/prune/generic_list.h b/contrib/prune/generic_list.h
index 39c2ed183b58bc810633a0e7197937e269a20ab7..047efc126ebb0d8f7304bad2505aef0f4720e068 100644 (file)
--- a/contrib/prune/generic_list.h
+++ b/contrib/prune/generic_list.h
@@ -10,15 +10,17 @@
 
 #pragma once
 
+#include <stddef.h>
+
     typedef void *gl_data;
 
     typedef struct {
-       uint64_t used;  /* number of elements in the list */
-       uint64_t size;  /* number of elements that the list can hold */
+       size_t used;    /* number of elements in the list */
+       size_t size;    /* number of elements that the list can hold */
        gl_data *data;          /* pointer to first element */
     } generic_list_t;
 
-    extern generic_list_t new_generic_list(uint64_t size);
+    extern generic_list_t new_generic_list(size_t size);
     extern void add_to_generic_list(generic_list_t * list,
                                               gl_data element);
     extern void free_generic_list(generic_list_t * list);