CVS gsasl/lib/src

[gsasl-commit]

Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv26267/lib/src

Modified Files:
        callback.c gsasl-compat.h gsasl.h.in internal.h obsolete.c 
Log Message:
Simplify callback hook.

--- /home/cvs/gsasl/lib/src/callback.c  2004/09/30 15:34:51     1.11
+++ /home/cvs/gsasl/lib/src/callback.c  2004/09/30 15:52:54     1.12
@@ -130,70 +130,35 @@
 }
 
 /**
- * gsasl_application_data_set:
+ * gsasl_callback_hook_set:
  * @ctx: libgsasl handle.
- * @appdata: opaque pointer to application specific data.
+ * @hook: opaque pointer to application specific data.
  *
  * Store application specific data in the libgsasl handle.  The
  * application data can be later (for instance, inside a callback) be
- * retrieved by calling gsasl_application_data_get().  It is normally
+ * retrieved by calling gsasl_callback_hook_get().  It is normally
  * used by the application to maintain state between the main program
  * and the callback.
  **/
 void
-gsasl_application_data_set (Gsasl * ctx, void *appdata)
+gsasl_callback_hook_set (Gsasl * ctx, void *hook)
 {
-  ctx->application_data = appdata;
+  ctx->application_hook = hook;
 }
 
 /**
- * gsasl_application_data_get:
+ * gsasl_callback_hook_get:
  * @ctx: libgsasl handle.
  *
  * Retrieve application specific data from libgsasl handle. The
- * application data is set using gsasl_appdata_set().  It is
+ * application data is set using gsasl_callback_hook_set().  It is
  * normally used by the application to maintain state between the main
  * program and the callback.
  *
  * Return value: Returns the application specific data, or NULL.
  **/
 void *
-gsasl_application_data_get (Gsasl * ctx)
+gsasl_callback_hook_get (Gsasl * ctx)
 {
-  return ctx->application_data;
-}
-
-/**
- * gsasl_appinfo_set:
- * @sctx: libgsasl session handle.
- * @appdata: opaque pointer to application specific data.
- *
- * Store application specific data in the libgsasl session handle.
- * The application data can be later (for instance, inside a callback)
- * be retrieved by calling gsasl_application_session_data_get().  It
- * is normally used by the application to maintain state between the
- * main program and the callback.
- **/
-void
-gsasl_appinfo_set (Gsasl_session * sctx, void *appdata)
-{
-  sctx->application_data = appdata;
-}
-
-/**
- * gsasl_appinfo_get:
- * @sctx: libgsasl session handle.
- *
- * Retrieve application specific data from libgsasl session
- * handle. The application data is set using
- * gsasl_application_session_data_set().  It is normally used by the
- * application to maintain state between the main program and the
- * callback.
- *
- * Return value: Returns the application specific data, or NULL.
- **/
-void *
-gsasl_appinfo_get (Gsasl_session * sctx)
-{
-  return sctx->application_data;
+  return ctx->application_hook;
 }
--- /home/cvs/gsasl/lib/src/gsasl-compat.h      2004/09/30 14:45:21     1.6
+++ /home/cvs/gsasl/lib/src/gsasl-compat.h      2004/09/30 15:52:54     1.7
@@ -284,5 +284,9 @@
 extern int gsasl_decode_inline (Gsasl_session * sctx,
                                const char *input, size_t input_len,
                                char *output, size_t * output_len);
+extern void gsasl_application_data_set (Gsasl * ctx, void *appdata);
+extern void *gsasl_application_data_get (Gsasl * ctx);
+extern void gsasl_appinfo_set (Gsasl_session * sctx, void *appdata);
+extern void *gsasl_appinfo_get (Gsasl_session * sctx);
 
 #endif /* GSASL_COMPAT_H */
--- /home/cvs/gsasl/lib/src/gsasl.h.in  2004/09/30 15:36:26     1.33
+++ /home/cvs/gsasl/lib/src/gsasl.h.in  2004/09/30 15:52:54     1.34
@@ -179,13 +179,11 @@
   extern const char *gsasl_check_version (const char *req_version);
 
   /* Callback handling: callback.c */
-  extern void gsasl_application_data_set (Gsasl * ctx, void *appdata);
-  extern void *gsasl_application_data_get (Gsasl * ctx);
-  extern void gsasl_appinfo_set (Gsasl_session * sctx, void *appdata);
-  extern void *gsasl_appinfo_get (Gsasl_session * sctx);
   extern void gsasl_callback_set (Gsasl * ctx, Gsasl_callback_function cb);
   extern int gsasl_callback (Gsasl * ctx, Gsasl_session * sctx,
                             Gsasl_property prop);
+  extern void gsasl_callback_hook_set (Gsasl * ctx, void *hook);
+  extern void *gsasl_callback_hook_get (Gsasl * ctx);
 
   /* Property handling: property.c */
   extern void gsasl_property_set (Gsasl_session * sctx, Gsasl_property prop,
--- /home/cvs/gsasl/lib/src/internal.h  2004/09/30 15:34:51     1.17
+++ /home/cvs/gsasl/lib/src/internal.h  2004/09/30 15:52:54     1.18
@@ -42,9 +42,9 @@
   Gsasl_mechanism *client_mechs;
   size_t n_server_mechs;
   Gsasl_mechanism *server_mechs;
-  void *application_data;
   /* Callback. */
   Gsasl_callback_function cb;
+  void *application_hook;
   /* Global properties. */
   char *anonymous_token;
   char *authid;
@@ -53,7 +53,7 @@
   char *passcode;
   char *pin;
   char *suggestedpin;
-  /* Obsolete callbacks. */
+  /* Obsolete stuff. */
   Gsasl_client_callback_authorization_id cbc_authorization_id;
   Gsasl_client_callback_authentication_id cbc_authentication_id;
   Gsasl_client_callback_password cbc_password;
@@ -85,7 +85,6 @@
   Gsasl *ctx;
   int clientp;
   Gsasl_mechanism *mech;
-  void *application_data;
   void *mech_data;
   /* Session specific properties.  If NULL, use corresponding global
    * property. */
@@ -96,6 +95,8 @@
   char *passcode;
   char *pin;
   char *suggestedpin;
+  /* Obsolete stuff. */
+  void *application_data;
 };
 
 #endif /* INTERNAL_H */
--- /home/cvs/gsasl/lib/src/obsolete.c  2004/09/23 00:20:57     1.9
+++ /home/cvs/gsasl/lib/src/obsolete.c  2004/09/30 15:52:54     1.10
@@ -528,3 +528,83 @@
 
   return res;
 }
+
+/**
+ * gsasl_application_data_set:
+ * @ctx: libgsasl handle.
+ * @appdata: opaque pointer to application specific data.
+ *
+ * Store application specific data in the libgsasl handle.  The
+ * application data can be later (for instance, inside a callback) be
+ * retrieved by calling gsasl_application_data_get().  It is normally
+ * used by the application to maintain state between the main program
+ * and the callback.
+ *
+ * Note that this function is obsolete and may be removed in the
+ * future.
+ **/
+void
+gsasl_application_data_set (Gsasl * ctx, void *appdata)
+{
+  ctx->application_hook = appdata;
+}
+
+/**
+ * gsasl_application_data_get:
+ * @ctx: libgsasl handle.
+ *
+ * Retrieve application specific data from libgsasl handle. The
+ * application data is set using gsasl_application_data_set().  It is
+ * normally used by the application to maintain state between the main
+ * program and the callback.
+ *
+ * Note that this function is obsolete and may be removed in the
+ * future.
+ *
+ * Return value: Returns the application specific data, or NULL.
+ **/
+void *
+gsasl_application_data_get (Gsasl * ctx)
+{
+  return ctx->application_hook;
+}
+
+/**
+ * gsasl_appinfo_set:
+ * @sctx: libgsasl session handle.
+ * @appdata: opaque pointer to application specific data.
+ *
+ * Store application specific data in the libgsasl session handle.
+ * The application data can be later (for instance, inside a callback)
+ * be retrieved by calling gsasl_appinfo_get().  It is normally used
+ * by the application to maintain state between the main program and
+ * the callback.
+ *
+ * Note that this function is obsolete and may be removed in the
+ * future.
+ **/
+void
+gsasl_appinfo_set (Gsasl_session * sctx, void *appdata)
+{
+  sctx->application_data = appdata;
+}
+
+/**
+ * gsasl_appinfo_get:
+ * @sctx: libgsasl session handle.
+ *
+ * Retrieve application specific data from libgsasl session
+ * handle. The application data is set using gsasl_appinfo_set().  It
+ * is normally used by the application to maintain state between the
+ * main program and the callback.
+ *
+ * Note that this function is obsolete and may be removed in the
+ * future.
+ *
+ * Return value: Returns the application specific data, or NULL.
+ **/
+void *
+gsasl_appinfo_get (Gsasl_session * sctx)
+{
+  return sctx->application_data;
+}