[Gnucash-changes] r14042 - gnucash/trunk - Fix the documentation of qof_query_merge for degenerate cases.

Derek Atkins warlord at cvs.gnucash.org
Sun May 14 12:59:32 EDT 2006


Author: warlord
Date: 2006-05-14 12:59:31 -0400 (Sun, 14 May 2006)
New Revision: 14042
Trac: http://svn.gnucash.org/trac/changeset/14042

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/lib/libqof/qof/qofquery.h
Log:
Fix the documentation of qof_query_merge for degenerate cases.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-05-14 16:04:50 UTC (rev 14041)
+++ gnucash/trunk/ChangeLog	2006-05-14 16:59:31 UTC (rev 14042)
@@ -1,3 +1,8 @@
+2006-05-14  Derek Atkins  <derek at ihtfp.com>
+
+	* src/lib/libqof/qof/qofquery.h:
+	  Fix the documentation of qof_query_merge for degenerate cases.
+
 2006-05-12  Derek Atkins <derek at ihtfp.com>
 
 	* goffice-config.h.in:

Modified: gnucash/trunk/lib/libqof/qof/qofquery.h
===================================================================
--- gnucash/trunk/lib/libqof/qof/qofquery.h	2006-05-14 16:04:50 UTC (rev 14041)
+++ gnucash/trunk/lib/libqof/qof/qofquery.h	2006-05-14 16:59:31 UTC (rev 14042)
@@ -276,8 +276,11 @@
  *  search for the set type.  If neither query has the search-type set,
  *  the result will be unset as well.
  *
- *  This will return a newly allocated QofQuery object, or NULL
- *  on error. Free it with qof_query_destroy() when no longer needed.
+ *  This will return a newly allocated QofQuery object, or NULL on
+ *  error. Free it with qof_query_destroy() when no longer needed.
+ *  Note that if either input query is NULL then the returned query is
+ *  NOT newly allocated -- it will return the non-NULL query.  You
+ *  only need to call this function when both q1 and q2 are non-NULL.
  */
 QofQuery * qof_query_merge(QofQuery *q1, QofQuery *q2, QofQueryOp op);
 



More information about the gnucash-changes mailing list