change: datatypes consistens

diff --git a/discspan.c b/discspan.c
index fb144740cbec253ae40b3ed7f0a4536ef49d378b..adf2e8025b8642b52f3d45c57118491780d14650 100644 (file)
--- a/discspan.c
+++ b/discspan.c
@@ -10,17 +10,17 @@
 extern void useage();
 
 int struct_array_length = 0;
-unsigned long long int split = 0;
+unsigned long long split = 0;
 
 typedef struct file_size {
        char name[255];
-       long long unsigned int fsize;
+       long long unsigned fsize;
 } file_size;
 
 /**
  * Gibt die Groesse in einer lesbaren Darstellung aus
  */
-void printHumanReadSize(const char *output, unsigned long long int splitgroesse)
+void printHumanReadSize(const char *output, unsigned long long splitgroesse)
 {
        unsigned long long humanread;
        char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'};
@@ -49,8 +49,8 @@ void printHumanReadSize(const char *output, unsigned long long int splitgroesse)
  */
 int cmpfunc(const void *filea, const void *fileb)
 {
-       long long unsigned int a = ((const struct file_size*)filea)->fsize;
-       long long unsigned int b = ((const struct file_size*)fileb)->fsize;
+       unsigned long long a = ((const struct file_size*)filea)->fsize;
+       unsigned long long b = ((const struct file_size*)fileb)->fsize;
 
        if (a < b)
                return 1;
@@ -91,8 +91,8 @@ int get_array_length(FILE *in)
  *
  * @return Arraylaenge
  */
-unsigned long fill_array_from_file(FILE *in, struct file_size *fs,
-               const long long unsigned int split)
+int fill_array_from_file(FILE *in, struct file_size *fs,
+               const unsigned long long split)
 {
        FILE *ignore = NULL;
        char pfad[255];