change discspan with stdint

diff --git a/src/discspan.c b/src/discspan.c
index 992993db096c366277c4dae5ede3c657f71ad70a..41ef495f8ffefb3f83018dd36dbe44815612779e 100644 (file)
--- a/src/discspan.c
+++ b/src/discspan.c
@@ -1,15 +1,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "config_discspan.h"
 #include "libspandisc.h"
 #include "help.h"
 
+#define BLURAY 24159191040
+#define DVD9 8500000000
+#define DVD5 4700000000
+#define CD 734003200
+
 typedef struct {
        char *input;
        char *output;
-       unsigned long long split;
+       uint64_t split;
 } param_t;
 
 void show_version()
@@ -22,13 +28,7 @@ param_t read_argument(int argc, char *argv[])
 {
        param_t parameter = { NULL, NULL, 0 };
 
-       // Medien groessen
-       const unsigned long long bluray = 24159191040;
-       const unsigned long long dvd9 = 8500000000;
-       const unsigned long long dvd5 = 4700000000;
-       const unsigned long long cd = 734003200;
-
-       int c = 0;
+       uint32_t c = 0;
        while ((c = getopt(argc, argv, ":59bcf:hi:o:v")) != -1) {
                switch (c) {
                case 'i':
@@ -38,16 +38,16 @@ param_t read_argument(int argc, char *argv[])
                        parameter.output = optarg;
                        break;
                case '5':
-                       parameter.split = dvd5;
+                       parameter.split = DVD5;
                        break;
                case '9':
-                       parameter.split = dvd9;
+                       parameter.split = DVD9;
                        break;
                case 'b':
-                       parameter.split = bluray;
+                       parameter.split = BLURAY;
                        break;
                case 'c':
-                       parameter.split = cd;
+                       parameter.split = CD;
                        break;
                case 'f':
                        parameter.split = atoll(optarg);
@@ -72,9 +72,9 @@ param_t read_argument(int argc, char *argv[])
 
 void print_human_read_size(const char *output, medium_t* medium)
 {
-       unsigned long long humanread;
+       uint64_t humanread;
        char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'};
-       int i = 0;
+       uint8_t i = 0;
 
        humanread = medium->freespace;
        while (humanread >= 1024) {
@@ -85,7 +85,7 @@ void print_human_read_size(const char *output, medium_t* medium)
        if (i > sizeof(einheit)/sizeof(einheit[0]))
                i = 0;
 
-       fprintf(stdout, "free space on %s: %lld bytes (%lld %c)\n", output,
+       fprintf(stdout, "free space on %s: %lld bytes (%ld %c)\n", output,
                        medium->freespace, humanread, einheit[i]);
 }