[tor-commits] [tor/master] Merge branch 'tor-github/pr/1294'

[asn at torproject.org]

commit ddd01541b909a84396e2d9ba31266ae63670c938
Merge: fb56b4c2b eb909c4e4
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Sep 5 17:12:19 2019 +0300

    Merge branch 'tor-github/pr/1294'

 src/app/config/confparse.c |  9 ++++++
 src/app/config/confparse.h | 69 +++++++++++++++++++++++++++++++++++++++++-----
 src/lib/conf/conftypes.h   |  4 +++
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --cc src/lib/conf/conftypes.h
index 612272e45,3db115204..4609564b3
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@@ -122,9 -100,13 +122,13 @@@ typedef struct struct_member_t 
   * that they have the correct type.
   */
  typedef struct struct_magic_decl_t {
+   /** The name of the structure */
    const char *typename;
+   /** A value used to recognize instances of this structure. */
    uint32_t magic_val;
+   /** The location within the structure at which we expect to find
+    * <b>magic_val</b>. */
 -  int magic_offset;
 +  ptrdiff_t magic_offset;
  } struct_magic_decl_t;
  
  /**