Rename the callback function.

This commit is contained in:
Andreas Schneider 2008-06-24 13:36:27 +02:00
parent aee15d55ee
commit d7309c4ff9
7 changed files with 14 additions and 11 deletions

View File

@ -193,7 +193,7 @@ csync_vio_method_t _method = {
.utimes = _utimes
};
csync_vio_method_t *vio_module_init(const char *method_name, const char *args, csync_module_auth_callback cb) {
csync_vio_method_t *vio_module_init(const char *method_name, const char *args, csync_auth_callback cb) {
DEBUG_DUMMY(("csync_dummy - method_name: %s\n", method_name));
DEBUG_DUMMY(("csync_dummy - args: %s\n", args));

View File

@ -35,7 +35,7 @@
#endif
SMBCCTX *smb_context = NULL;
csync_module_auth_callback auth_cb = NULL;
csync_auth_callback auth_cb = NULL;
/* Do we build against Samba 3.2 */
#ifdef DEPRECATED_SMBC_INTERFACE
@ -483,7 +483,7 @@ csync_vio_method_t _method = {
};
csync_vio_method_t *vio_module_init(const char *method_name, const char *args,
csync_module_auth_callback cb) {
csync_auth_callback cb) {
smb_context = smbc_new_context();
DEBUG_SMB(("csync_smb - method_name: %s\n", method_name));

View File

@ -591,7 +591,7 @@ int csync_remove_config_dir(CSYNC *ctx) {
return 0;
}
int csync_set_module_auth_callback(CSYNC *ctx, csync_module_auth_callback cb) {
int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb) {
if (ctx == NULL || cb == NULL) {
return -1;
}
@ -614,7 +614,7 @@ char *csync_get_journal_file(CSYNC *ctx) {
return c_strdup(ctx->journal.file);
}
csync_module_auth_callback csync_get_module_auth_callback(CSYNC *ctx) {
csync_auth_callback csync_get_auth_callback(CSYNC *ctx) {
if (ctx == NULL) {
return NULL;
}

View File

@ -55,7 +55,7 @@ extern "C" {
#define CSYNC_JOURNAL_FILE "csync_journal.db"
#define CSYNC_LOCK_FILE "lock"
typedef void (*csync_module_auth_callback) (char *usr, size_t usrlen, char *pwd, size_t pwlen);
typedef void (*csync_auth_callback) (char *usr, size_t usrlen, char *pwd, size_t pwlen);
/**
* csync handle
@ -131,8 +131,11 @@ int csync_add_exclude_list(CSYNC *ctx, const char *path);
char *csync_get_config_dir(CSYNC *ctx);
int csync_set_config_dir(CSYNC *ctx, const char *path);
int csync_remove_config_dir(CSYNC *ctx);
csync_module_auth_callback csync_get_module_auth_callback(CSYNC *ctx);
int csync_set_module_auth_callback(CSYNC *ctx, csync_module_auth_callback cb);
int csync_enable_journal(CSYNC *ctx);
int csync_disable_journal(CSYNC *ctx);
int csync_is_journal_disabled(CSYNC *ctx);
csync_auth_callback csync_get_auth_callback(CSYNC *ctx);
int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);
char *csync_get_journal_file(CSYNC *ctx);
int csync_get_status(CSYNC *ctx);
int csync_set_status(CSYNC *ctx, int status);

View File

@ -75,7 +75,7 @@ enum csync_replica_e {
* @brief csync public structure
*/
struct csync_s {
csync_module_auth_callback auth_callback;
csync_auth_callback auth_callback;
c_strlist_t *excludes;
struct {

View File

@ -35,7 +35,7 @@
typedef struct csync_vio_method_s csync_vio_method_t;
typedef csync_vio_method_t *(*csync_vio_method_init_fn)(const char *method_name, const char *config_args, csync_module_auth_callback cb);
typedef csync_vio_method_t *(*csync_vio_method_init_fn)(const char *method_name, const char *config_args, csync_auth_callback cb);
typedef void (*csync_vio_method_finish_fn)(csync_vio_method_t *method);
typedef csync_vio_method_handle_t *(*csync_method_open_fn)(const char *durl, int flags, mode_t mode);

View File

@ -26,7 +26,7 @@
#include "vio/csync_vio_method.h"
extern csync_vio_method_t *vio_module_init (const char *method_name,
const char *args, csync_module_auth_callback cb);
const char *args, csync_auth_callback cb);
extern void vio_module_shutdown(csync_vio_method_t *method);
#endif /* _CSYNC_VIO_MODULE_H */