util-strings: drop unused safe_atou()

Not used anywhere.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

configure.ac

@@ -43,8 +43,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-CFLAGS="$CFLAGS -Wno-declaration-after-statement"
-
 # Obtain compiler/linker options from server and required extensions
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.19] xproto [inputproto >= 2.2])
 PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0])

src/util-strings.c

@@ -92,9 +92,7 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements)
 	}
 
 	size_t strv_len = nelems + 1; /* NULL-terminated */
-	char **strv = calloc(strv_len, sizeof(*strv));
+	char **strv = zalloc(strv_len * sizeof *strv);
-	if (!strv)
-		return NULL;
 
 	size_t idx = 0;
 	const char *word;

src/util-strings.h

@@ -137,10 +137,7 @@ double_array_from_string(const char *in,
 	if(!strv)
 		return result;
 
-	double *numv = calloc(nelem, sizeof(double));
+	double *numv = zalloc(sizeof(double) * nelem);
-	if (!numv)
-		goto out;
-
 	for (size_t idx = 0; idx < nelem; idx++) {
 		double val;
 		if (!safe_atod(strv[idx], &val))

src/xf86libinput.c

@@ -141,10 +141,6 @@ struct accel_points {
 };
 #endif
 
-struct xf86libinput_pressure_range {
-	float min, max;
-};
-
 struct xf86libinput {
 	InputInfoPtr pInfo;
 	char *path;
@@ -203,7 +199,9 @@ struct xf86libinput {
 
 		float rotation_angle;
 		struct bezier_control_point pressurecurve[4];
-		struct xf86libinput_pressure_range pressure_range;
+		struct range {
+			float min, max;
+		} pressure_range;
 		struct ratio {
 			int x, y;
 		} area;
@@ -469,7 +467,7 @@ xf86libinput_set_pressurecurve(struct xf86libinput *driver_data,
 
 static inline bool
 xf86libinput_set_pressure_range(struct xf86libinput *driver_data,
-				const struct xf86libinput_pressure_range *rangeopt)
+				const struct range *rangeopt)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -941,7 +939,7 @@ LibinputApplyConfigPressureRange(DeviceIntPtr dev,
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
-	struct xf86libinput_pressure_range *rangeopt = &driver_data->options.pressure_range;
+	struct range *rangeopt = &driver_data->options.pressure_range;
 
 	if (!subdevice_has_capabilities(dev, CAP_TABLET_TOOL))
 		return;
@@ -2741,12 +2739,6 @@ xf86libinput_handle_event(struct libinput_event *event)
 			break;
 		case LIBINPUT_EVENT_SWITCH_TOGGLE:
 			break;
-
-		// new libinput events we don't handle yet
-		case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
-		case LIBINPUT_EVENT_GESTURE_HOLD_END:
-		case LIBINPUT_EVENT_TABLET_PAD_KEY:
-			break;
 	}
 
 out:
@@ -3693,7 +3685,7 @@ out:
 static void
 xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 					 struct xf86libinput *driver_data,
-					 struct xf86libinput_pressure_range *rangeopt)
+					 struct range *rangeopt)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -5392,7 +5384,7 @@ LibinputSetPropertyPressureRange(DeviceIntPtr dev,
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct xf86libinput *driver_data = pInfo->private;
 	float *vals;
-	struct xf86libinput_pressure_range rangeopt = { 0.0, 1.0 };
+	struct range rangeopt = { 0.0, 1.0 };
 
 	if (val->format != 32 || val->size != 2 || val->type != prop_float)
 		return BadMatch;
@@ -6671,7 +6663,7 @@ LibinputInitPressureRangeProperty(DeviceIntPtr dev,
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
-	const struct xf86libinput_pressure_range *rangeopt = &driver_data->options.pressure_range;
+	const struct range *rangeopt = &driver_data->options.pressure_range;
 	float data[2] = {
 		rangeopt->min,
 		rangeopt->max,