Rev 49: use ctdb_call_info, so struct ctdb_call can be used for top level call in http://samba.org/~tridge/ctdb

[tridge]

------------------------------------------------------------
revno: 49
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Thu 2007-01-25 15:19:16 +1100
message:
  use ctdb_call_info, so struct ctdb_call can be used for top level call
modified:
  common/ctdb_call.c             ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  ctdb_bench.c                   ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
  ctdb_test.c                    ctdb_test.c-20061117234101-o3qt14umlg9en8z0-16
  include/ctdb.h                 ctdb.h-20061117234101-o3qt14umlg9en8z0-11
=== modified file 'common/ctdb_call.c'
--- a/common/ctdb_call.c        2007-01-23 00:38:45 +0000
+++ b/common/ctdb_call.c        2007-01-25 04:19:16 +0000
@@ -49,10 +49,10 @@
                           int call_id, TDB_DATA *call_data, TDB_DATA 
*reply_data,
                           uint32_t caller)
 {
-       struct ctdb_call *c;
+       struct ctdb_call_info *c;
        struct ctdb_registered_call *fn;
 
-       c = talloc(ctdb, struct ctdb_call);
+       c = talloc(ctdb, struct ctdb_call_info);
        CTDB_NO_MEMORY(ctdb, c);
 
        c->key = key;

=== modified file 'ctdb_bench.c'
--- a/ctdb_bench.c      2006-12-19 05:27:03 +0000
+++ b/ctdb_bench.c      2007-01-25 04:19:16 +0000
@@ -50,7 +50,7 @@
 /*
   ctdb call function to increment an integer
 */
-static int incr_func(struct ctdb_call *call)
+static int incr_func(struct ctdb_call_info *call)
 {
        if (call->record_data.dsize == 0) {
                call->new_data = talloc(call, TDB_DATA);
@@ -70,7 +70,7 @@
 /*
   ctdb call function to fetch a record
 */
-static int fetch_func(struct ctdb_call *call)
+static int fetch_func(struct ctdb_call_info *call)
 {
        call->reply_data = &call->record_data;
        return 0;

=== modified file 'ctdb_test.c'
--- a/ctdb_test.c       2006-12-01 04:45:24 +0000
+++ b/ctdb_test.c       2007-01-25 04:19:16 +0000
@@ -33,7 +33,7 @@
 /*
   add an integer into a record in sorted order
 */
-static int sort_func(struct ctdb_call *call)
+static int sort_func(struct ctdb_call_info *call)
 {
        if (call->call_data == NULL ||
            call->call_data->dsize != sizeof(int)) {
@@ -64,7 +64,7 @@
 /*
   ctdb call function to fetch a record
 */
-static int fetch_func(struct ctdb_call *call)
+static int fetch_func(struct ctdb_call_info *call)
 {
        call->reply_data = &call->record_data;
        return 0;

=== modified file 'include/ctdb.h'
--- a/include/ctdb.h    2007-01-23 00:38:45 +0000
+++ b/include/ctdb.h    2007-01-25 04:19:16 +0000
@@ -24,7 +24,7 @@
 /*
   structure passed to a ctdb call function
 */
-struct ctdb_call {
+struct ctdb_call_info {
        TDB_DATA key;          /* record key */
        TDB_DATA record_data;  /* current data in the record */
        TDB_DATA *new_data;    /* optionally updated record data */
@@ -85,7 +85,7 @@
 const char *ctdb_errstr(struct ctdb_context *);
 
 /* a ctdb call function */
-typedef int (*ctdb_fn_t)(struct ctdb_call *);
+typedef int (*ctdb_fn_t)(struct ctdb_call_info *);
 
 /*
   setup a ctdb call function