sane rd_field access function names

diff --git a/main.c b/main.c
index 4f6ca2c34caa8a4c667e4d84e2313966f1a64c7b..6d9f4df7cff232418dbb10b5221a4c3e33dcee05 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,7 +15,7 @@ main(void)
 {
        t_rdata_field *new;
 
-       new = rd_new(20, RD_DNAME_T, (uint8_t*)"hallo.nl");
+       new = rd_field_new(20, RD_DNAME_T, (uint8_t*)"hallo.nl");
        xprintf_rd_field(new);
        return 0;
 }

diff --git a/rdata.c b/rdata.c
index dcded3823d35f59df3d74f597ce9a13c606640bf..61ac60f70ceb64c6da8d6d82ab72e9437e4c83d1 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -21,38 +21,38 @@
 
 /* read */
 uint16_t
-rd_size(t_rdata_field *rd)
+rd_field_size(t_rdata_field *rd)
 {
        return rd->_size;
 }
 
 t_rd_type
-rd_type(t_rdata_field *rd)
+rd_field_type(t_rdata_field *rd)
 {
        return rd->_type;
 }
 
 uint8_t *
-rd_data(t_rdata_field *rd)
+rd_field_data(t_rdata_field *rd)
 {
        return rd->_data;
 }
 
 /* write */
 void
-rd_set_size(t_rdata_field *rd, uint16_t s)
+rd_field_set_size(t_rdata_field *rd, uint16_t s)
 {
        rd->_size = s;
 }
 
 void
-rd_set_type(t_rdata_field *rd, t_rd_type t)
+rd_field_set_type(t_rdata_field *rd, t_rd_type t)
 {
        rd->_type = t;
 }
 
 void
-rd_set_data(t_rdata_field *rd, uint8_t *d, uint16_t s)
+rd_field_set_data(t_rdata_field *rd, uint8_t *d, uint16_t s)
 {
        rd->_data = xmalloc(s);
        memcpy(rd->_data, d, s);
@@ -62,7 +62,7 @@ rd_set_data(t_rdata_field *rd, uint8_t *d, uint16_t s)
  * and return it
  */
 t_rdata_field *
-rd_new(uint16_t s, t_rd_type t, uint8_t *d)
+rd_field_new(uint16_t s, t_rd_type t, uint8_t *d)
 {
        t_rdata_field *new;
        new = xmalloc(sizeof(t_rdata_field));
@@ -70,9 +70,9 @@ rd_new(uint16_t s, t_rd_type t, uint8_t *d)
        if (NULL == new)
                return NULL;
 
-       rd_set_size(new, s);
-       rd_set_type(new, t);
-       rd_set_data(new, d, s);
+       rd_field_set_size(new, s);
+       rd_field_set_type(new, t);
+       rd_field_set_data(new, d, s);
 
        return(new);
 }
@@ -84,7 +84,7 @@ rd_new(uint16_t s, t_rd_type t, uint8_t *d)
  * uint8_t == char !!!!
  */
 t_rdata_field *
-rd_new_frm_string(t_rd_type t, char *s)
+rd_field_new_frm_string(t_rd_type t, char *s)
 {
        t_rdata_field *new;
        new = xmalloc(sizeof(t_rdata_field));
@@ -92,14 +92,14 @@ rd_new_frm_string(t_rd_type t, char *s)
        if (NULL == new)
                return NULL;
 
-       rd_set_size(new, (uint16_t)strlen(s));
-       rd_set_type(new, t);
-       rd_set_data(new, (uint8_t*) s, (uint16_t)strlen(s));
+       rd_field_set_size(new, (uint16_t)strlen(s));
+       rd_field_set_type(new, t);
+       rd_field_set_data(new, (uint8_t*) s, (uint16_t)strlen(s));
 
        return(new);
 }
 
-void rd_destroy(t_rdata_field *rd)
+void rd_field_destroy(t_rdata_field *rd)
 {
        rd = NULL; /* kuch */
        /* empty */

diff --git a/rdata.h b/rdata.h
index 035a908e398cd084f3dd1de0f501df49394577ba..86ad55dd9e6766bec7c2d6265e6b07d67c7a6d0d 100644 (file)
--- a/rdata.h
+++ b/rdata.h
@@ -89,13 +89,13 @@ struct type_struct_rdata_field
 typedef struct type_struct_rdata_field t_rdata_field;
 
 /* prototypes */
-uint16_t        rd_size(t_rdata_field *);
-uint8_t         *rd_data(t_rdata_field *);
-void            rd_set_size(t_rdata_field *, uint16_t);
-void            rd_set_type(t_rdata_field *, t_rd_type);
-void            rd_set_data(t_rdata_field *, uint8_t *, uint16_t);
-t_rd_type       rd_type(t_rdata_field *);
-t_rdata_field   *rd_new(uint16_t, t_rd_type, uint8_t *);
-void            rd_destroy(t_rdata_field *);
+uint16_t        rd_field_size(t_rdata_field *);
+void            rd_field_set_size(t_rdata_field *, uint16_t);
+void            rd_field_set_type(t_rdata_field *, t_rd_type);
+void            rd_field_set_data(t_rdata_field *, uint8_t *, uint16_t);
+t_rd_type       rd_field_type(t_rdata_field *);
+t_rdata_field   *rd_field_new(uint16_t, t_rd_type, uint8_t *);
+uint8_t         *rd_field_data(t_rdata_field *);
+void            rd_field__destroy(t_rdata_field *);
 #endif /* _RDATA_H */
 

diff --git a/util.c b/util.c
index 5922a1c30860490feb3f212a6f8c91c5e93052f0..4ea3b4f7706eb84a6037a472c2f26cf27ebf7802 100644 (file)
--- a/util.c
+++ b/util.c
@@ -30,7 +30,7 @@ void
 xprintf_rd_field(t_rdata_field *rd)
 {
        /* assume printable string */
-       fprintf(stdout, "size\t:%u\n", (unsigned int)rd_size(rd));
-       fprintf(stdout, "type\t:%u\n", (unsigned int)rd_type(rd));
-       fprintf(stdout, "data\t:[%.*s]\n", (int)rd_size(rd), (char*)rd_data(rd));
+       fprintf(stdout, "size\t:%u\n", (unsigned int)rd_field_size(rd));
+       fprintf(stdout, "type\t:%u\n", (unsigned int)rd_field_type(rd));
+       fprintf(stdout, "data\t:[%.*s]\n", (int)rd_field_size(rd), (char*)rd_field_data(rd));
 }