From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Sat, 14 Nov 2020 08:28:09 +0000 (+0900)
Subject: timer: add checks for method arguments
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ea37eb74693d21bc3815779c3a624d8efdda233a;p=alsa-gobject.git

timer: add checks for method arguments

In Rules for use of GError, it's just used for recoverable runtime
error, not for programming error. The invalid arguments are a kind of
programming error.

This commit adds the check for method arguments.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---

diff --git a/src/timer/instance-params.c b/src/timer/instance-params.c
index 0265a35..37fa373 100644
--- a/src/timer/instance-params.c
+++ b/src/timer/instance-params.c
@@ -147,9 +147,9 @@ void alsatimer_instance_params_set_event_filter(ALSATimerInstanceParams *self,
     int i;
 
     g_return_if_fail(ALSATIMER_IS_INSTANCE_PARAMS(self));
-    g_return_if_fail(entries != NULL);
     priv = alsatimer_instance_params_get_instance_private(self);
 
+    g_return_if_fail(entries != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     priv->params.filter = 0;
@@ -197,10 +197,10 @@ void alsatimer_instance_params_get_event_filter(ALSATimerInstanceParams *self,
     int i;
 
     g_return_if_fail(ALSATIMER_IS_INSTANCE_PARAMS(self));
-    g_return_if_fail(entries != NULL);
-    g_return_if_fail(entry_count != NULL);
     priv = alsatimer_instance_params_get_instance_private(self);
 
+    g_return_if_fail(entries != NULL);
+    g_return_if_fail(entry_count != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     count = 0;
diff --git a/src/timer/instance-status.c b/src/timer/instance-status.c
index 6f44faf..3ab8d01 100644
--- a/src/timer/instance-status.c
+++ b/src/timer/instance-status.c
@@ -116,9 +116,10 @@ void alsatimer_instance_status_get_tstamp(ALSATimerInstanceStatus *self,
     ALSATimerInstanceStatusPrivate *priv;
 
     g_return_if_fail(ALSATIMER_IS_INSTANCE_STATUS(self));
-    g_return_if_fail(tstamp != NULL);
     priv = alsatimer_instance_status_get_instance_private(self);
 
+    g_return_if_fail(tstamp != NULL);
+
     priv->tstamp[0] = (gint64)priv->status.tstamp.tv_sec;
     priv->tstamp[1] = (gint64)priv->status.tstamp.tv_nsec;
 
diff --git a/src/timer/query.c b/src/timer/query.c
index 8778bae..f9d506a 100644
--- a/src/timer/query.c
+++ b/src/timer/query.c
@@ -192,6 +192,7 @@ void alsatimer_get_device_info(ALSATimerDeviceId *device_id,
     int fd;
 
     g_return_if_fail(device_id != NULL);
+    g_return_if_fail(device_info != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     alsatimer_get_devnode(&devnode, error);
diff --git a/src/timer/user-instance.c b/src/timer/user-instance.c
index 0ff6c66..352a595 100644
--- a/src/timer/user-instance.c
+++ b/src/timer/user-instance.c
@@ -180,6 +180,7 @@ void alsatimer_user_instance_get_protocol_version(ALSATimerUserInstance *self,
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(proto_ver_triplet != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     if (priv->fd < 0) {
@@ -244,9 +245,9 @@ void alsatimer_user_instance_attach(ALSATimerUserInstance *self,
     struct snd_timer_select sel = {0};
 
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
-    g_return_if_fail(device_id != NULL);
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(device_id != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     sel.id = *device_id;
@@ -313,6 +314,7 @@ void alsatimer_user_instance_get_info(ALSATimerUserInstance *self,
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(instance_info != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     *instance_info = g_object_new(ALSATIMER_TYPE_INSTANCE_INFO, NULL);
@@ -345,6 +347,7 @@ void alsatimer_user_instance_set_params(ALSATimerUserInstance *self,
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(instance_params != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     timer_instance_params_refer_private(*instance_params, &params);
@@ -374,6 +377,7 @@ void alsatimer_user_instance_get_status(ALSATimerUserInstance *self,
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(instance_status != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     g_return_if_fail(ALSATIMER_IS_INSTANCE_STATUS(*instance_status));
@@ -487,6 +491,7 @@ void alsatimer_user_instance_create_source(ALSATimerUserInstance *self,
     g_return_if_fail(ALSATIMER_IS_USER_INSTANCE(self));
     priv = alsatimer_user_instance_get_instance_private(self);
 
+    g_return_if_fail(gsrc != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
     if (priv->fd < 0) {