Fix commandline parameter handling for fixed canframe.data[] .

git-svn-id: svn://svn.berlios.de//socketcan/trunk@787 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/can-utils/cangen.c b/can-utils/cangen.c
index 907811a4803b092797cc8c9cd6c72bd27e024572..fd9e9a5a3cadcb5cae6916090c131b4334c8409a 100644 (file)
--- a/can-utils/cangen.c
+++ b/can-utils/cangen.c
@@ -194,9 +194,10 @@ int main(int argc, char **argv)
                                data_mode = MODE_INCREMENT;
                        } else {
                                data_mode = MODE_FIX;
-                               incdata = strtoull(optarg, NULL, 16);
-                               for (i=0; i<8 ;i++)
-                                       frame.data[i] = (incdata >> (7-i)*8) & 0xFFULL;
+                               if (hexstring2candata(optarg, &frame)) {
+                                       printf ("wrong fix data definition\n");
+                                       return 1;
+                               }
                        }
                        break;
 
@@ -225,7 +226,6 @@ int main(int argc, char **argv)
        ts.tv_sec = gap / 1000;
        ts.tv_nsec = (gap % 1000) * 1000000;
 
-
        if (id_mode == MODE_FIX) {
 
                /* recognize obviously missing commandline option */