Merge branch 'killsg' of github.com:karlp/stlink into killsg

49-stlinkv2.rules

@@ -1,9 +1,11 @@
-# stm32l discovery board, with onboard st/linkv2
-#
+# stm32 discovery boards, with onboard st/linkv2
+# ie, STM32L, STM32F4.
+# STM32VL has st/linkv1, which is quite different
+
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", \
     MODE:="0666", \
-    SYMLINK+="stm32l_stlink%n"
-#
+    SYMLINK+="stlinkv2_%n"
+
 # If you share your linux system with other users, or just don't like the
 # idea of write permission for everybody, you can replace MODE:="0666" with
 # OWNER:="yourusername" to create the device owned by you, or with

gdbserver/gdb-server.c

@@ -143,7 +143,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
             break;
         case 'd':
             if (strlen(optarg) > sizeof (st->devicename)) {
-                fprintf(stderr, "device name too long: %ld\n", strlen(optarg));
+                fprintf(stderr, "device name too long: %zd\n", strlen(optarg));
             } else {
                 strcpy(st->devicename, optarg);
             }