Fix datatype issue in sscanf() on 64bit systems.

[sojka/can-utils.git] / cangw.c

diff --git a/cangw.c b/cangw.c
index d6e96682f9287b977627f12ffecbd9a8298d3701..fbc230d4599e9a4532b14ac945bf37e0a6f829fa 100644 (file)
--- a/cangw.c
+++ b/cangw.c
@@ -328,8 +328,7 @@ int parse_mod(char *optarg, struct modattr *modmsg)
                ptr++;
        }
 
-       if (sscanf(++ptr, "%lx.%hhx.%16s",
-                  (long unsigned int *)&modmsg->cf.can_id,
+       if (sscanf(++ptr, "%x.%hhx.%16s", &modmsg->cf.can_id,
                   (unsigned char *)&modmsg->cf.can_dlc, hexdata) != 3)
                return 5;
 
@@ -593,13 +592,11 @@ int main(int argc, char **argv)
                        break;
 
                case 'f':
-                       if (sscanf(optarg, "%lx:%lx",
-                                  (long unsigned int *)&filter.can_id, 
-                                  (long unsigned int *)&filter.can_mask) == 2) {
+                       if (sscanf(optarg, "%x:%x", &filter.can_id,
+                                  &filter.can_mask) == 2) {
                                have_filter = 1;
-                       } else if (sscanf(optarg, "%lx~%lx",
-                                         (long unsigned int *)&filter.can_id, 
-                                         (long unsigned int *)&filter.can_mask) == 2) {
+                       } else if (sscanf(optarg, "%x~%x", &filter.can_id,
+                                         &filter.can_mask) == 2) {
                                filter.can_id |= CAN_INV_FILTER;
                                have_filter = 1;
                        } else {