Merge lp:~3v1n0/frame/remove-asserts-on-device-get into lp:frame

[Marco Trevisan (Treviño)]

device: don't use asserts to get properties on failures, to avoid crashes

[lp:~3v1n0/frame/remove-asserts-on-device-get]

123. By Marco Trevisan (Treviño) on 2016-08-09

device: don't use asserts to get properties on failures, to avoid crashes

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'src/device.cpp'
--- src/device.cpp	2012-12-04 18:46:01 +0000
+++ src/device.cpp	2016-08-09 15:48:12 +0000
@@ -20,8 +20,6 @@
 
 #include "device.h"
 
-#include <assert.h>
-
 #include "axis.h"
 
 #include <oif/frame_backend.h>
@@ -135,8 +133,11 @@
   unsigned int num_axes;
   UFStatus status = frame_device_get_property(device, UFDevicePropertyNumAxes,
                                               &num_axes);
-  assert(status == UFStatusSuccess);
-  return num_axes;
+  if (status == UFStatusSuccess)
+    return num_axes;
+
+  fprintf(stderr, "Error: failed to get device number of axes\n");
+  return 0;
 }
 
 float frame_device_get_window_resolution_x(UFDevice device) {
@@ -144,8 +145,11 @@
   UFStatus status = frame_device_get_property(device,
                                               UFDevicePropertyWindowResolutionX,
                                               &resolution);
-  assert(status == UFStatusSuccess);
-  return resolution;
+  if (status == UFStatusSuccess)
+    return resolution;
+
+  fprintf(stderr, "Error: failed to get device X resolution\n");
+  return 0;
 }
 
 float frame_device_get_window_resolution_y(UFDevice device) {
@@ -153,8 +157,11 @@
   UFStatus status = frame_device_get_property(device,
                                               UFDevicePropertyWindowResolutionY,
                                               &resolution);
-  assert(status == UFStatusSuccess);
-  return resolution;
+  if (status == UFStatusSuccess)
+    return resolution;
+
+  fprintf(stderr, "Error: failed to get device Y resolution\n");
+  return 0;
 }
 
 UFStatus frame_accept_touch(UFDevice device, UFWindowId window_id,