member underscores added

diff --git a/rdata.c b/rdata.c
index cb4a88778a43e75f6b632f2948578300654ee7ee..87b5850e7034f12e5a801e87684f3ec141b0c9e7 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -54,10 +54,10 @@ rd_field_set_type(t_rdata_field *rd, t_rd_type t)
 }
 
 void
-rd_field_set_data(t_rdata_field *rd, uint8_t *d, uint16_t s)
+rd_field_set_data(t_rdata_field *rd, uint8_t *d)
 {
-       XMALLOC(rd->_data, uint8_t, s);
-       memcpy(rd->_data, d, s);
+       /* only copy the pointer */
+       rd->_data = d;
 }
 
 /**
@@ -74,7 +74,7 @@ rd_field_new(uint16_t s, t_rd_type t, uint8_t *d)
 
        rd_field_set_size(rd, s);
        rd_field_set_type(rd, t);
-       rd_field_set_data(rd, d, s);
+       rd_field_set_data(rd, d);
 
        return(rd);
 }
@@ -83,23 +83,11 @@ rd_field_new(uint16_t s, t_rd_type t, uint8_t *d)
  * Allocate a new t_rdata_field from
  * a NULL terminated string
  * and return it
- *
- * uint8_t == char?  XXX 
  */
 t_rdata_field *
 rd_field_new_frm_string(t_rd_type t, char *s)
 {
-       t_rdata_field *new;
-       MALLOC(new, t_rdata_field);
-
-       if (!new)
-               return NULL;
-
-       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);
+       return NULL;
 }
 
 void rd_field_destroy(t_rdata_field *rd)

diff --git a/rdata.h b/rdata.h
index 2cc266ba5f946c6cdae38b46c2306d4aeac43849..ab13d0ef19f9e8a243281d7176b18b6f08424b9e 100644 (file)
--- a/rdata.h
+++ b/rdata.h
@@ -121,11 +121,11 @@ typedef struct type_struct_rdata_field t_rdata_field;
  */
 struct type_struct_rdata_field_descriptor
 {
-        uint16_t    type;       /* RR type */
-        const char *name;       /* Textual name.  */
-        uint8_t     minimum;    /* Minimum number of RDATA FIELDs.  */
-        uint8_t     maximum;    /* Maximum number of RDATA FIELDs.  */
-        uint8_t     wireformat[MAXRDATALEN]; /* rdata_wireformat_type */
+        uint16_t    _type;       /* RR type */
+        const char *_name;       /* Textual name.  */
+        uint8_t     _minimum;    /* Minimum number of RDATA FIELDs.  */
+        uint8_t     _maximum;    /* Maximum number of RDATA FIELDs.  */
+        uint8_t     _wireformat[MAXRDATALEN]; /* rdata_wireformat_type */
 };
 typedef struct type_struct_rdata_field_descriptor t_rdata_field_descriptor;
 
@@ -134,7 +134,7 @@ typedef struct type_struct_rdata_field_descriptor t_rdata_field_descriptor;
 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);
+void            rd_field_set_data(t_rdata_field *, uint8_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 *);

diff --git a/rr.c b/rr.c
index 078de258c33e0b7c24312d3ba690f1de6462dce2..2d291bfd10585735b3359a43903c7331a3833f76 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -29,7 +29,7 @@ rr_new(void)
                 return NULL;
 
        rr_set_rd_count(rr, 0);
-       rr->rdata_fields = NULL; /* XXX */
+       rr->_rdata_fields = NULL; /* XXX */
         return(rr);
 }
 
@@ -81,10 +81,10 @@ rr_push_rd_field(t_rr *rr, t_rdata_field *f)
        rd_count = rr_rd_count(rr);
        
        /* grow the array */
-       XREALLOC(rr->rdata_fields, t_rdata_field *, rd_count + 1);
+       XREALLOC(rr->_rdata_fields, t_rdata_field *, rd_count + 1);
 
        /* add the new member */
-       rr->rdata_fields[rd_count] = f;
+       rr->_rdata_fields[rd_count] = f;
 
        rr_set_rd_count(rr, rd_count + 1);
 }

diff --git a/rr.h b/rr.h
index e5cff1ca757b979d1ac648911101d6c0286e3ad6..77eb6d20c5b5b15b0e2594044bc3c53978a80f4c 100644 (file)
--- a/rr.h
+++ b/rr.h
@@ -141,7 +141,7 @@ struct type_struct_rr
        t_class         _klass; 
        /* everything in the rdata is in network order */
        /** \brief The list of rdata's */
-       t_rdata_field   **rdata_fields;
+       t_rdata_field   **_rdata_fields;
 };
 typedef struct type_struct_rr t_rr;
 

diff --git a/util.c b/util.c
index 11992cddae798c61fe28578fdc2c8694c6bf8605..054ff0cdf1b1373dd92965b8cb628cb3220b5fed 100644 (file)
--- a/util.c
+++ b/util.c
@@ -35,6 +35,6 @@ xprintf_rr(t_rr *rr)
 
        for(i = 0; i < count; i++) {
                printf("print rd %u\n", i);
-               xprintf_rd_field(rr->rdata_fields[i]);
+               xprintf_rd_field(rr->_rdata_fields[i]);
        }
 }