../src/wcmISDV4.c:100:2: warning: missing field 'DetectConfig' initializer [-Wmissing-field-initializers] }; ^ ../src/wcmTouchFilter.c:254:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:254:49: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:314:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:314:49: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:395:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:395:49: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; ^ ../src/wcmTouchFilter.c:587:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}; ^ ../src/wcmTouchFilter.c:613:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}; ^ ../src/wcmTouchFilter.c:714:30: warning: missing field 'device_id' initializer [-Wmissing-field-initializers] WacomDeviceState ds[2] = {{0}}; ^ xsetwacom.c:465:9: warning: missing field 'desc' initializer [-Wmissing-field-initializers] { NULL } ^
Signed-off-by: Jason Gerecke <killert...@gmail.com> --- src/wcmISDV4.c | 1 + src/wcmTouchFilter.c | 12 ++++++------ tools/xsetwacom.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c index 55439eb..7d7ee9b 100644 --- a/src/wcmISDV4.c +++ b/src/wcmISDV4.c @@ -97,6 +97,7 @@ static int wcmWriteWait(InputInfoPtr pInfo, const char* request); isdv4GetRanges, /* query ranges */ isdv4StartTablet, /* start tablet */ isdv4Parse, + NULL, }; static void memdump(InputInfoPtr pInfo, char *buffer, unsigned int len) diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c index b1ac4cd..3062cde 100644 --- a/src/wcmTouchFilter.c +++ b/src/wcmTouchFilter.c @@ -251,7 +251,7 @@ static void wcmSendButtonClick(WacomDevicePtr priv, int button, int state) static void wcmFingerTapToClick(WacomDevicePtr priv) { WacomCommonPtr common = priv->common; - WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; + WacomDeviceState ds[2] = {}, dsLast[2] = {}; if (!common->wcmGesture) return; @@ -311,7 +311,7 @@ static CARD32 wcmSingleFingerTapTimer(OsTimerPtr timer, CARD32 time, pointer arg static void wcmSingleFingerTap(WacomDevicePtr priv) { WacomCommonPtr common = priv->common; - WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; + WacomDeviceState ds[2] = {}, dsLast[2] = {}; getStateHistory(common, ds, ARRAY_SIZE(ds), 0); getStateHistory(common, dsLast, ARRAY_SIZE(dsLast), 1); @@ -392,7 +392,7 @@ void wcmCancelGesture(InputInfoPtr pInfo) void wcmGestureFilter(WacomDevicePtr priv, int touch_id) { WacomCommonPtr common = priv->common; - WacomDeviceState ds[2] = {{0}}, dsLast[2] = {{0}}; + WacomDeviceState ds[2] = {}, dsLast[2] = {}; getStateHistory(common, ds, ARRAY_SIZE(ds), 0); getStateHistory(common, dsLast, ARRAY_SIZE(dsLast), 1); @@ -584,7 +584,7 @@ static void wcmSendScrollEvent(WacomDevicePtr priv, int dist, WacomCommonPtr common = priv->common; int count = (int)((1.0 * abs(dist)/ common->wcmGestureParameters.wcmScrollDistance) + 0.5); - WacomDeviceState ds[2] = {{0}}; + WacomDeviceState ds[2] = {}; getStateHistory(common, ds, ARRAY_SIZE(ds), 0); @@ -610,7 +610,7 @@ static void wcmSendScrollEvent(WacomDevicePtr priv, int dist, static void wcmFingerScroll(WacomDevicePtr priv) { WacomCommonPtr common = priv->common; - WacomDeviceState ds[2] = {{0}}; + WacomDeviceState ds[2] = {}; int midPoint_new = 0; int midPoint_old = 0; int i = 0, dist = 0; @@ -711,7 +711,7 @@ static void wcmFingerScroll(WacomDevicePtr priv) static void wcmFingerZoom(WacomDevicePtr priv) { WacomCommonPtr common = priv->common; - WacomDeviceState ds[2] = {{0}}; + WacomDeviceState ds[2] = {}; int count, button; int dist = touchDistance(common->wcmGestureState[0], common->wcmGestureState[1]); diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index b936107..31b682e 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -462,7 +462,7 @@ static param_t parameters[] = .get_func = get_all, .prop_flags = PROP_FLAG_READONLY, }, - { NULL } + {} }; /** -- 2.1.0 ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel