haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-09-25 12:32:53 +00:00
Code Issues Releases Wiki Activity

fix somebugs

Browse Source
This commit is contained in:
vegarden
2013-08-09 14:24:12 +08:00
parent e2e594a8a2
commit 65677b5601
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
demo/Makefile.am
View File

@@ -10,15 +10,18 @@ noinst_PROGRAMS = searpc-demo-server searpc-demo-client searpc-async-client
searpc_demo_server_SOURCES = test-object.c searpc-demo-server.c searpc-demo-packet.h searpc_demo_server_SOURCES = test-object.c searpc-demo-server.c searpc-demo-packet.h
searpc_demo_server_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ searpc_demo_server_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ \
@GLIB_LIBS@ @JANSSON_LIBS@
searpc_demo_client_SOURCES = test-object.c searpc-demo-client.c searpc-demo-packet.h searpc_demo_client_SOURCES = test-object.c searpc-demo-client.c searpc-demo-packet.h
searpc_demo_client_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ searpc_demo_client_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ \
@GLIB_LIBS@ @JANSSON_LIBS@
searpc_async_client_SOURCES = demo-async-client.c searpc-demo-packet.h searpc_async_client_SOURCES = demo-async-client.c searpc-demo-packet.h
searpc_async_client_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ searpc_async_client_LDADD = ${top_builddir}/lib/libsearpc.la @LIB_WS32@ \
@GLIB_LIBS@ @JANSSON_LIBS@
EXTRA_DIST = rpc_table.py EXTRA_DIST = rpc_table.py

6
lib/searpc-client.c
View File

@@ -71,7 +71,7 @@ fcall_to_str (const char *fname, int n_params, va_list args, gsize *len)
const char *type = va_arg(args, const char *); const char *type = va_arg(args, const char *);
void *value = va_arg(args, void *); void *value = va_arg(args, void *);
if (strcmp(type, "int") == 0) if (strcmp(type, "int") == 0)
json_array_append_new (array, json_integer ((int)value)); json_array_append_new (array, json_integer ((int)(long)value));
else if (strcmp(type, "int64") == 0) else if (strcmp(type, "int64") == 0)
json_array_append_new (array, json_integer (*((gint64 *)value))); json_array_append_new (array, json_integer (*((gint64 *)value)));
else if (strcmp(type, "string") == 0) else if (strcmp(type, "string") == 0)
@@ -541,7 +541,7 @@ searpc_client_fret__int (char *data, size_t len, GError **error)
int ret; int ret;
if (handle_ret_common(data, len, &object, error) == 0) { if (handle_ret_common(data, len, &object, error) == 0) {
ret = json_integer_value(json_object_get(object, "ret")); ret = json_integer_value (json_object_get(object, "ret"));
json_decref(object); json_decref(object);
return ret; return ret;
} }
@@ -556,7 +556,7 @@ searpc_client_fret__int64 (char *data, size_t len, GError **error)
gint64 ret; gint64 ret;
if (handle_ret_common(data, len, &object, error) == 0) { if (handle_ret_common(data, len, &object, error) == 0) {
ret = json_integer(json_object_get(object, "ret")); ret = json_integer_value (json_object_get(object, "ret"));
json_decref(object); json_decref(object);
return ret; return ret;
} }

2
lib/searpc-server.c
View File

@@ -134,7 +134,7 @@ searpc_set_objlist_to_ret_object (json_t *object, GList *ret)
} }
char * char *
searpc_marshal_set_ret_common (json_t *object, int *len, GError *error) searpc_marshal_set_ret_common (json_t *object, gsize *len, GError *error)
{ {
char *data; char *data;

2
lib/searpc-server.h
View File

@@ -17,7 +17,7 @@ void searpc_set_string_to_ret_object (json_t *object, char *ret);
void searpc_set_int_to_ret_object (json_t *object, json_int_t ret); void searpc_set_int_to_ret_object (json_t *object, json_int_t ret);
void searpc_set_object_to_ret_object (json_t *object, GObject *ret); void searpc_set_object_to_ret_object (json_t *object, GObject *ret);
void searpc_set_objlist_to_ret_object (json_t *object, GList *ret); void searpc_set_objlist_to_ret_object (json_t *object, GList *ret);
char *searpc_marshal_set_ret_common (json_t *object, int *len, GError *error); char *searpc_marshal_set_ret_common (json_t *object, gsize *len, GError *error);
/** /**
* searpc_server_init: * searpc_server_init: