[svn] assuan - r385 - in trunk: doc src

[svn author wk]

Author: wk
Date: 2010-08-11 16:01:10 +0200 (Wed, 11 Aug 2010)
New Revision: 385

Modified:
   trunk/doc/assuan.texi
   trunk/src/client.c
   trunk/src/context.c
Log:
doc changes


Modified: trunk/doc/assuan.texi
===================================================================
--- trunk/doc/assuan.texi	2010-08-11 13:10:08 UTC (rev 384)
+++ trunk/doc/assuan.texi	2010-08-11 14:01:10 UTC (rev 385)
@@ -822,9 +822,12 @@
 not desirable.  By setting this flag, a call to @code{waitpid} will be
 suppressed and the caller is responsible to cleanup the child process.
 @item ASSUAN_CONFIDENTIAL
-Uses to return the state of the confidential logging mode.
+Use to return the state of the confidential logging mode.
 @item ASSUAN_NO_FIXSIGNALS
 Do not modify signal handler for @code{SIGPIPE}.
+ at item ASSUAN_CONVEY_COMMENTS
+If enabled comment lines are passed to the status callback of the
+ at code{assuan_transact}.
 @end table
 @end deftp
 @end deftypefun

Modified: trunk/src/client.c
===================================================================
--- trunk/src/client.c	2010-08-11 13:10:08 UTC (rev 384)
+++ trunk/src/client.c	2010-08-11 14:01:10 UTC (rev 385)
@@ -228,11 +228,10 @@
  * 
  * FIXME: Write documentation
  * 
- * Return value: 0 on success or error code.  The error code may be
- * the one one returned by the server in error lines or from the
- * callback functions.  Take care: When a callback returns an error
- * this function returns immediately with an error and thus the caller
- * will altter return an Assuan error (write erro in most cases).
+ * Return value: 0 on success or an error code.  The error code may be
+ * the one one returned by the server via error lines or from the
+ * callback functions.  Take care:  If a callback returns an error
+ * this function returns immediately with this error.
  **/
 gpg_error_t
 assuan_transact (assuan_context_t ctx,

Modified: trunk/src/context.c
===================================================================
--- trunk/src/context.c	2010-08-11 13:10:08 UTC (rev 384)
+++ trunk/src/context.c	2010-08-11 14:01:10 UTC (rev 385)
@@ -122,7 +122,7 @@
 }
 
 
-/* Same as assuan_set_flag (ctx, ASSUAN_NO_WAITPID, 1).  */
+/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 1).  */
 void
 assuan_begin_confidential (assuan_context_t ctx)
 {
@@ -130,7 +130,7 @@
 }
 
 
-/* Same as assuan_set_flag (ctx, ASSUAN_NO_WAITPID, 0).  */
+/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0).  */
 void
 assuan_end_confidential (assuan_context_t ctx)
 {