Commit: 40730129dee0b6e81747e4acc3fe158e228e58b4 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: 40730129dee0b6e81747e4acc3fe158e228e58b4 (tree)
• Time: 2010-02-09 08:07:16
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

strdup is not ansi C, add my_strdup function

Thanks Johan Robben for pointing this out

Change Summary

• modified: src/main_common.hpp

Incremental Difference

--- a/src/main_common.hpp
+++ b/src/main_common.hpp
@@ -85,6 +85,18 @@ class WrongCalibratorException : public std::invalid_argument {
             std::invalid_argument(msg) {}
 };
 
+// strdup: non-ansi
+char* my_strdup(const char* s);
+char* my_strdup(const char* s) {
+    size_t len = strlen(s) + 1;
+    void* p = malloc(len);
+
+    if (p == NULL)
+        return NULL;
+
+    return (char*) memcpy(p, s, len);
+}
+
 // all need struct XYinfo, and some the consts too
 #include "calibrator.cpp"
 #include "calibrator/calibratorXorgPrint.cpp"
@@ -92,7 +104,6 @@ class WrongCalibratorException : public std::invalid_argument {
 #include "calibrator/calibratorUsbtouchscreen.cpp"
 
 
-
 /**
  * find a calibratable touchscreen device (using XInput)
  *
@@ -180,7 +191,7 @@ int find_device(const char* pre_device, bool verbose, bool list_devices,
                     // a calibratable touschscreen
                     found++;
                     device_id = list->id;
-                    device_name = strdup(list->name);
+                    device_name = my_strdup(list->name);
                     device_axys.x_min = ax[0].min_value;
                     device_axys.x_max = ax[0].max_value;
                     device_axys.y_min = ax[1].min_value;