[X2Go-Commits] [libx2goclient] 43/132: src/x2goclient-openssh-version.c: use type safety macros in macros that handle setting version components.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository libx2goclient.

commit 7f88b1d106c8e99cc8a424e165e4ba1f5bd63605
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Apr 26 07:57:16 2021 +0200

    src/x2goclient-openssh-version.c: use type safety macros in macros that handle setting version components.
    
    This has actually bitten me before, so make sure that it doesn't happen
    again.
---
 src/x2goclient-openssh-version.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c
index b2dcf0f..a2c4c5d 100644
--- a/src/x2goclient-openssh-version.c
+++ b/src/x2goclient-openssh-version.c
@@ -62,6 +62,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
 #define GENERATE_ERROR_MSG_(component, msg) #component " " msg
 #define GENERATE_ERROR_MSG(out_var, idx_var, msg) \
   do {\
+    X2GOCLIENT_CHECK_TYPE (char *, out_var);\
     if (0 == idx_var) {\
       out_var = GENERATE_ERROR_MSG_ ("Major", msg);\
     }\
@@ -87,11 +88,13 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
 
 #define SET_VER_COMPONENT(ver_struct, idx_var, value, init) \
   do {\
+    X2GOCLIENT_CHECK_TYPE (X2GoClientOpenSSHVersion *, (ver_struct));\
     _Bool valid = TRUE;\
     if ((init)) {\
       valid = FALSE;\
     }\
     if (0 == (idx_var)) {\
+      X2GOCLIENT_CHECK_TYPE_TYPEOF ((ver_struct)->major, (value));\
       if ((init)) {\
         (ver_struct)->major = 0;\
       }\
@@ -101,6 +104,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
       (ver_struct)->major_valid = valid;\
     }\
     else if (1 == (idx_var)) {\
+      X2GOCLIENT_CHECK_TYPE_TYPEOF ((ver_struct)->minor, (value));\
       if ((init)) {\
         (ver_struct)->minor = 0;\
       }\
@@ -110,6 +114,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
       (ver_struct)->minor_valid = valid;\
     }\
     else {\
+      X2GOCLIENT_CHECK_TYPE_TYPEOF ((ver_struct)->patch, (value));\
       if ((init)) {\
         (ver_struct)->patch = 0;\
       }\
@@ -124,6 +129,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
 
 #define CHECK_VER_COMPONENT(ver_struct, idx_var, err) \
   do {\
+    X2GOCLIENT_CHECK_TYPE (X2GoClientOpenSSHVersion *, (ver_struct));\
     _Bool new_err = (err);\
     if (0 == (idx_var)) {\
       new_err = (!((ver_struct)->major_valid));\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git