package/bind/0003-Rename-ptrsize-to-ptr_size.patch

   1 From 254dc19788ba2a03504fc6d1036fef477a60035f Mon Sep 17 00:00:00 2001
   2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
   3 Date: Fri, 22 Jan 2016 08:31:02 -0300
   4 Subject: [PATCH] Rename ptrsize to ptr_size
   5
   6 This is to compensate for a uClibc mess caused by commit
   7 70a04a287a2875c82e6822c36e071afba5b63a62 where ptrsize is defined for
   8 mips, hence causing build breakage under certain conditions for programs
   9 that use this variable name.
  10
  11 Status: definitely not upstreamable.
  12
  13 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  14 ---
  15  lib/dns/rbt.c   | 6 +++---
  16  lib/dns/rbtdb.c | 4 ++--
  17  2 files changed, 5 insertions(+), 5 deletions(-)
  18
  19 diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
  20 index 86b5183..5fd55de 100644
  21 --- a/lib/dns/rbt.c
  22 +++ b/lib/dns/rbt.c
  23 @@ -113,7 +113,7 @@ struct file_header {
  24          * information about the system on which the map file was generated
  25          * will be used to tell if we can load the map file or not
  26          */
  27 -       isc_uint32_t ptrsize;
  28 +       isc_uint32_t ptr_size;
  29         unsigned int bigendian:1;       /* big or little endian system */
  30         unsigned int rdataset_fixed:1;  /* compiled with --enable-rrset-fixed */
  31         unsigned int nodecount;         /* shadow from rbt structure */
  32 @@ -517,7 +517,7 @@ write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset,
  33         memmove(header.version1, FILE_VERSION, sizeof(header.version1));
  34         memmove(header.version2, FILE_VERSION, sizeof(header.version2));
  35         header.first_node_offset = first_node_offset;
  36 -       header.ptrsize = (isc_uint32_t) sizeof(void *);
  37 +       header.ptr_size = (isc_uint32_t) sizeof(void *);
  38         header.bigendian = (1 == htonl(1)) ? 1 : 0;
  39
  40  #ifdef DNS_RDATASET_FIXED
  41 @@ -902,7 +902,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
  42         }
  43  #endif
  44
  45 -       if (header->ptrsize != (isc_uint32_t) sizeof(void *)) {
  46 +       if (header->ptr_size != (isc_uint32_t) sizeof(void *)) {
  47                 result = ISC_R_INVALIDFILE;
  48                 goto cleanup;
  49         }
  50 diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
  51 index c7168cb..dbcf944 100644
  52 --- a/lib/dns/rbtdb.c
  53 +++ b/lib/dns/rbtdb.c
  54 @@ -114,7 +114,7 @@ typedef struct rbtdb_file_header rbtdb_file_header_t;
  55
  56  struct rbtdb_file_header {
  57         char version1[32];
  58 -       isc_uint32_t ptrsize;
  59 +       isc_uint32_t ptr_size;
  60         unsigned int bigendian:1;
  61         isc_uint64_t tree;
  62         isc_uint64_t nsec;
  63 @@ -7593,7 +7593,7 @@ rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location,
  64         memset(&header, 0, sizeof(rbtdb_file_header_t));
  65         memmove(header.version1, FILE_VERSION, sizeof(header.version1));
  66         memmove(header.version2, FILE_VERSION, sizeof(header.version2));
  67 -       header.ptrsize = (isc_uint32_t) sizeof(void *);
  68 +       header.ptr_size = (isc_uint32_t) sizeof(void *);
  69         header.bigendian = (1 == htonl(1)) ? 1 : 0;
  70         header.tree = (isc_uint64_t) tree_location;
  71         header.nsec = (isc_uint64_t) nsec_location;
  72 --
  73 2.4.10
  74