From b3de8cd674063c53a24766f8fa0b374425dd1a49 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 3 Sep 2007 13:07:59 +0000 Subject: doc/ 2007-09-03 Marcus Brinkmann * assuan.texi: Fix prototype and documentation for assuan_inquire_ext. src/ 2007-09-03 Marcus Brinkmann * assuan.h (assuan_inquire_ext): Move buffer and buffer_length arguments callback in prototype. * assuan-defs.h (struct assuan_context_s): Remove members inquire_r_buffer and inquire_r_buffer_len. Add buffer and buffer length arguments to inquire_cb. * assuan-inquire.c (_assuan_inquire_ext_cb): Return buffer and buffer length via callback. (assuan_inquire_ext): Move buffer and buffer length arguments to callback. --- src/ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 65ec799..2935d9f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< .mine 2007-09-03 Marcus Brinkmann * assuan.h (assuan_inquire_ext): Move buffer and buffer_length @@ -11,12 +10,10 @@ (assuan_inquire_ext): Move buffer and buffer length arguments to callback. -======= 2007-08-24 Werner Koch Switched license to back to LGPLv2.1. ->>>>>>> .r250 2007-08-09 Marcus Brinkmann * assuan.h (assuan_process_done, assuan_inquire_ext): New -- cgit v1.2.3