Browse Source

Macros for clish_udata_t

Serj Kalichev 6 years ago
parent
commit
bb58b0c719
2 changed files with 9 additions and 33 deletions
  1. 6 6
      clish/udata.h
  2. 3 27
      clish/udata/udata.c

+ 6 - 6
clish/udata.h

@@ -11,17 +11,17 @@
 #ifndef _clish_udata_h
 #define _clish_udata_h
 
+#include "clish/macros.h"
+
 typedef struct clish_udata_s clish_udata_t;
 
-/*=================================
- * USERDATA INTERFACE
- *================================= */
 int clish_udata_compare(const void *first, const void *second);
 clish_udata_t *clish_udata_new(const char *name, void *data);
 void *clish_udata_free(clish_udata_t *instance);
-void *clish_udata__get_data(const clish_udata_t *instance);
-int clish_udata__set_data(clish_udata_t *instance, void *data);
-char *clish_udata__get_name(const clish_udata_t *instance);
+
+_CLISH_SET(udata, void *, data);
+_CLISH_GET(udata, void *, data);
+_CLISH_GET_STR(udata, name);
 
 #endif				/* _clish_udata_h */
 /** @} clish_udata */

+ 3 - 27
clish/udata/udata.c

@@ -52,30 +52,6 @@ void *clish_udata_free(clish_udata_t *this)
 	return data;
 }
 
-/*--------------------------------------------------------- */
-void *clish_udata__get_data(const clish_udata_t *this)
-{
-	if (!this)
-		return NULL;
-	return this->data;
-}
-
-/*--------------------------------------------------------- */
-int clish_udata__set_data(clish_udata_t *this, void *data)
-{
-	if (!this)
-		return -1;
-	this->data = data;
-	return 0;
-}
-
-/*--------------------------------------------------------- */
-char *clish_udata__get_name(const clish_udata_t *this)
-{
-	if (!this)
-		return NULL;
-	return this->name;
-}
-
-
-/*--------------------------------------------------------- */
+CLISH_SET(udata, void *, data);
+CLISH_GET(udata, void *, data);
+CLISH_GET_STR(udata, name);