summaryrefslogtreecommitdiff
path: root/core/rpc.c
diff options
context:
space:
mode:
authorRoberto De Ioris <roberto@unbit.it>2012-11-09 12:16:39 +0100
committerRoberto De Ioris <roberto@unbit.it>2012-11-09 12:16:39 +0100
commitceebaa7d9d8bf8f79ea1b223a36f75e44adda233 (patch)
treea14eb2d4b8952bb0c20a73bece956271606b2524 /core/rpc.c
parent0fa2c543ec252a30e56257c5e54b6d6167441f61 (diff)
downloaduwsgi-ceebaa7d9d8bf8f79ea1b223a36f75e44adda233.tar.gz
fixed indentation
Diffstat (limited to 'core/rpc.c')
-rw-r--r--core/rpc.c85
1 files changed, 43 insertions, 42 deletions
diff --git a/core/rpc.c b/core/rpc.c
index aa7c5b4f..893593ee 100644
--- a/core/rpc.c
+++ b/core/rpc.c
@@ -16,7 +16,7 @@ int uwsgi_register_rpc(char *name, uint8_t modifier1, uint8_t args, void *func)
if (uwsgi.shared->rpc_count < MAX_RPC) {
urpc = &uwsgi.shared->rpc_table[uwsgi.shared->rpc_count];
-
+
memcpy(urpc->name, name, strlen(name));
urpc->modifier1 = modifier1;
urpc->args = args;
@@ -39,7 +39,7 @@ uint16_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], cha
int i;
uint16_t ret = 0;
- for(i=0;i<uwsgi.shared->rpc_count;i++) {
+ for (i = 0; i < uwsgi.shared->rpc_count; i++) {
if (uwsgi.shared->rpc_table[i].name[0] != 0) {
if (!strcmp(uwsgi.shared->rpc_table[i].name, name)) {
urpc = &uwsgi.shared->rpc_table[i];
@@ -58,71 +58,72 @@ uint16_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], cha
}
-char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint16_t *len) {
+char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint16_t * len) {
uint8_t i;
uint16_t ulen;
struct uwsgi_header uh;
char *buffer = NULL;
-
+
*len = 0;
- if (node == NULL || !strcmp(node, "")) {
+ if (node == NULL || !strcmp(node, "")) {
// allocate the whole buffer
buffer = uwsgi_malloc(65536);
- *len = uwsgi_rpc(func, argc, argv, argvs, buffer);
+ *len = uwsgi_rpc(func, argc, argv, argvs, buffer);
return buffer;
- }
+ }
// connect to node
- int fd = uwsgi_connect(node, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+ int fd = uwsgi_connect(node, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
- if (fd < 0) return NULL;
+ if (fd < 0)
+ return NULL;
- // prepare a uwsgi array
+ // prepare a uwsgi array
uint16_t buffer_size = 2 + strlen(func);
- for (i = 0; i < argc; i++) {
- buffer_size += 2 + argvs[i];
- }
+ for (i = 0; i < argc; i++) {
+ buffer_size += 2 + argvs[i];
+ }
// allocate the whole buffer
buffer = uwsgi_malloc(65536);
- uh.modifier1 = 173;
- uh.pktsize = buffer_size;
- uh.modifier2 = 0;
+ uh.modifier1 = 173;
+ uh.pktsize = buffer_size;
+ uh.modifier2 = 0;
// add func to the array
- char *bufptr = buffer;
- ulen = strlen(func);
- *bufptr++ = (uint8_t) (ulen & 0xff);
- *bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
- memcpy(bufptr, func, ulen);
- bufptr += ulen;
-
- for (i = 0; i < argc; i++) {
- ulen = argvs[i];
- *bufptr++ = (uint8_t) (ulen & 0xff);
- *bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
- memcpy(bufptr, argv[i], ulen);
- bufptr += ulen;
- }
-
- if (write(fd, &uh, 4) != 4) {
- uwsgi_error("write()");
- close(fd);
+ char *bufptr = buffer;
+ ulen = strlen(func);
+ *bufptr++ = (uint8_t) (ulen & 0xff);
+ *bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
+ memcpy(bufptr, func, ulen);
+ bufptr += ulen;
+
+ for (i = 0; i < argc; i++) {
+ ulen = argvs[i];
+ *bufptr++ = (uint8_t) (ulen & 0xff);
+ *bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
+ memcpy(bufptr, argv[i], ulen);
+ bufptr += ulen;
+ }
+
+ if (write(fd, &uh, 4) != 4) {
+ uwsgi_error("write()");
+ close(fd);
free(buffer);
- return NULL;
- }
+ return NULL;
+ }
- if (write(fd, buffer, buffer_size) != buffer_size) {
- uwsgi_error("write()");
- close(fd);
+ if (write(fd, buffer, buffer_size) != buffer_size) {
+ uwsgi_error("write()");
+ close(fd);
free(buffer);
- return NULL;
- }
+ return NULL;
+ }
if (uwsgi_read_response(fd, &uh, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &buffer) < 0) {
close(fd);
@@ -131,7 +132,7 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
}
close(fd);
-
+
*len = uh.pktsize;
if (*len == 0) {
free(buffer);