[taler-merchant] branch master updated (6a7bdb0 -> a7db122)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository merchant.

    from 6a7bdb0  fix json_pack format string
     new 023586d  doxygen fixes
     new 4b0649d  Merge branch 'master' of git+ssh://git.taler.net/merchant
     new a7db122  doxygen fixes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/gnunet.tag     | 143 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/doxygen/taler.doxy |   8 ++-
 2 files changed, 146 insertions(+), 5 deletions(-)

diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag
index 1cf4f0d..73a1326 100644
--- a/contrib/gnunet.tag
+++ b/contrib/gnunet.tag
@@ -35,21 +35,164 @@
       <arglist></arglist>
     </member>
   </compound>
+
+  <compound kind="file">
+    <name>gnunet_common.h</name>
+    <path></path>
+    <filename>gnunet_db_lib.h</filename>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_free</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(ptr)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_free_non_null</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(ptr)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_malloc_large</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(size)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_realloc</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(ptr, size)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_new</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(type)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_malloc</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(size)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_new_array</name>
+      <anchorfile>gnunet_common.h</anchorfile>
+      <arglist>(n, type)</arglist>
+    </member>
+  </compound>
+  <compound kind="file">
+    <name>gnunet_db_lib.h</name>
+    <path></path>
+    <filename>gnunet_db_lib.h</filename>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_DB_STATUS_SUCCESS_ONE_RESULT</name>
+      <anchorfile>gnunet_db_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_DB_STATUS_SUCCESS_NO_RESULTS</name>
+      <anchorfile>gnunet_db_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
+  </compound>
   <compound kind="file">
     <name>gnunet_pq_lib.h</name>
     <path></path>
     <filename>gnunet_pq_lib.h</filename>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_PQ_query_param_auto_from_type</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(x)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <name>GNUNET_PQ_result_spec_end</name>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <name>GNUNET_PQ_result_spec_auto_from_type</name>
+      <arglist>(name, dst)</arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_PQ_ResultSpec</type>
+      <name>GNUNET_PQ_result_spec_absolute_time</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(const char *name, struct GNUNET_TIME_Absolute *at)</arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_PQ_ResultSpec</type>
+      <name>GNUNET_PQ_result_spec_absolute_time_nbo</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(const char *name, struct GNUNET_TIME_AbsoluteNBO *at)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <name>GNUNET_PQ_PREPARED_STATEMENT_END</name>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <name>GNUNET_PQ_EXECUTE_STATEMENT_END</name>
+      <arglist></arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_PQ_QueryParam</type>
+      <name>GNUNET_PQ_query_param_absolute_time</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(const struct GNUNET_TIME_Absolute *x)</arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_PQ_QueryParam</type>
+      <name>GNUNET_PQ_query_param_absolute_time_nbo</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(const struct GNUNET_TIME_AbsoluteNBO *x)</arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_SQ_QueryParam</type>
+      <name>GNUNET_SQ_query_param_absolute_time</name>
+      <anchorfile>gnunet_sq_lib.h</anchorfile>
+      <arglist>(const struct GNUNET_TIME_Absolute *x)</arglist>
+    </member>
+    <member kind="function">
+      <type>struct GNUNET_SQ_QueryParam</type>
+      <name>GNUNET_PQ_query_param_absolute_time_nbo</name>
+      <anchorfile>gnunet_sq_lib.h</anchorfile>
+      <arglist>(const struct GNUNET_TIME_AbsoluteNBO *x)</arglist>
+    </member>
     <member kind="define">
       <type>#define</type>
       <name>GNUNET_PQ_query_param_end</name>
       <anchorfile>gnunet_pq_lib.h</anchorfile>
       <arglist></arglist>
     </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_SQ_query_param_end</name>
+      <anchorfile>gnunet_sq_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
     <member kind="typedef">
       <type>int</type>
       <name>GNUNET_PQ_ResultConverter</name>
       <anchorfile>gnunet_pq_lib.h</anchorfile>
       <arglist>)(void *cls, PGresult *result, int row, const char *fname, 
size_t *dst_size, void *dst)</arglist>
     </member>
+    <member kind="typedef">
+      <type>int</type>
+      <name>GNUNET_SQ_ResultConverter</name>
+      <anchorfile>gnunet_sq_lib.h</anchorfile>
+      <arglist>)(void *cls, sqlite3_stmt *result, unsigned int column, size_t 
*dst_size, void *dst)</arglist>
+    </member>
   </compound>
 </tagfile>
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
index 67e36bd..9b27a7d 100644
--- a/doc/doxygen/taler.doxy
+++ b/doc/doxygen/taler.doxy
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GNU Taler: Merchant"
-PROJECT_NUMBER         = 0.6.0
+PROJECT_NUMBER         = 0.8.0
 PROJECT_LOGO           = logo.svg
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
@@ -262,16 +262,14 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
-TAGFILES               = ../../contrib/gnunet.tag ../../contrib/microhttpd.tag
-GENERATE_TAGFILE       = taler-exchange.tag
+TAGFILES               = ../../contrib/gnunet.tag ../../contrib/microhttpd.tag 
taler-exchange.tag
+GENERATE_TAGFILE       = taler-merchant.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
 CLASS_GRAPH            = NO

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.