zscanner: rename wire_dname_to_str() to dname_to_str() to avoid name collision

diff --git a/src/libzscanner/functions.c b/src/libzscanner/functions.c
index 6a3d00f2aaade60b1c0f388b542c56a0276db495..43a5d8a58f014035ff9ede903f7838ce837e9f97 100644 (file)
--- a/src/libzscanner/functions.c
+++ b/src/libzscanner/functions.c
@@ -808,9 +808,9 @@ int date_to_timestamp(uint8_t *buff, uint32_t *timestamp)
        return ZS_OK;
 }
 
-void wire_dname_to_str(const uint8_t  *data,
-                       const uint32_t data_len,
-                       char           *text)
+void dname_to_str(const uint8_t  *data,
+                  const uint32_t data_len,
+                  char           *text)
 {
        uint32_t i = 0, text_len = 0;
 

diff --git a/src/libzscanner/functions.h b/src/libzscanner/functions.h
index 69a963a16633b8b0c35d4313af9e49500eb1de55..e73f9897d50df03e5ef37d8cddaa1c519884c1c0 100644 (file)
--- a/src/libzscanner/functions.h
+++ b/src/libzscanner/functions.h
@@ -82,9 +82,9 @@ int date_to_timestamp(uint8_t *buff, uint32_t *timestamp);
  * \param data_len     Length of the buffer.
  * \param text         Text output.
  */
-void wire_dname_to_str(const uint8_t  *data,
-                       const uint32_t data_len,
-                       char *text);
+void dname_to_str(const uint8_t  *data,
+                  const uint32_t data_len,
+                  char *text);
 
 /*!
  * \brief Converts unsigned integer to mantissa*10^(exponent).

diff --git a/src/libzscanner/scanner.c.g2 b/src/libzscanner/scanner.c.g2
index 079b23d0365258318ebab1f4713912caa168a531..657bde0f6d8f07203ca2da8f83c707216b0040af 100644 (file)
--- a/src/libzscanner/scanner.c.g2
+++ b/src/libzscanner/scanner.c.g2
@@ -45367,13 +45367,11 @@ tr1174:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.
@@ -45434,13 +45432,11 @@ tr1184:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.
@@ -45512,13 +45508,11 @@ tr1196:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.
@@ -45592,13 +45586,11 @@ tr1202:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.
@@ -45932,13 +45924,11 @@ tr1211:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.

diff --git a/src/libzscanner/scanner.c.t0 b/src/libzscanner/scanner.c.t0
index d00c4e348d2081160bf37fb72f83f259ca32e024..ccf4fdce45d2e2be16a8bd68f32e61af8ae6ce23 100644 (file)
--- a/src/libzscanner/scanner.c.t0
+++ b/src/libzscanner/scanner.c.t0
@@ -7801,13 +7801,11 @@ _match:
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.

diff --git a/src/libzscanner/scanner_body.rl b/src/libzscanner/scanner_body.rl
index 82bcfbd86d59421e57f567f4c41dce1759b6c351..cbe7c9f7b7bbbf3ae2e5301a3ccb7b4a424da24b 100644 (file)
--- a/src/libzscanner/scanner_body.rl
+++ b/src/libzscanner/scanner_body.rl
@@ -794,13 +794,11 @@
 
                // Origin conversion from wire to text form in \DDD notation.
                if (s->dname == NULL) { // Use current origin.
-                       wire_dname_to_str(s->zone_origin,
-                                         s->zone_origin_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->zone_origin, s->zone_origin_length,
+                                    (char *)s->buffer);
                } else { // Use specified origin.
-                       wire_dname_to_str(s->r_data,
-                                         s->r_data_length,
-                                         (char *)s->buffer);
+                       dname_to_str(s->r_data, s->r_data_length,
+                                    (char *)s->buffer);
                }
 
                // Let the caller to solve the include.