[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35466 - in gnunet/src: identity rest
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35466 - in gnunet/src: identity rest |
Date: |
Thu, 26 Mar 2015 18:03:20 +0100 |
Author: schanzen
Date: 2015-03-26 18:03:19 +0100 (Thu, 26 Mar 2015)
New Revision: 35466
Modified:
gnunet/src/identity/plugin_rest_identity.c
gnunet/src/rest/rest.c
Log:
-fix
Modified: gnunet/src/identity/plugin_rest_identity.c
===================================================================
--- gnunet/src/identity/plugin_rest_identity.c 2015-03-26 16:40:36 UTC (rev
35465)
+++ gnunet/src/identity/plugin_rest_identity.c 2015-03-26 17:03:19 UTC (rev
35466)
@@ -37,8 +37,6 @@
#define ID_REST_STATE_POST_INIT 1
-#define URL_PARAM_SUBSYS "service"
-
#define GNUNET_REST_JSONAPI_IDENTITY_EGO "ego"
#define GNUNET_REST_JSONAPI_IDENTITY_KEY "key"
@@ -307,7 +305,7 @@
return;
}
if ( (strlen (GNUNET_REST_API_NS_IDENTITY) == strlen (handle->url) )) {
- GNUNET_CRYPTO_hash (URL_PARAM_SUBSYS, strlen (URL_PARAM_SUBSYS), &key);
+ GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM, strlen
(GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM), &key);
if ( GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_contains
(handle->conndata_handle->url_param_map,
&key) )
Modified: gnunet/src/rest/rest.c
===================================================================
--- gnunet/src/rest/rest.c 2015-03-26 16:40:36 UTC (rev 35465)
+++ gnunet/src/rest/rest.c 2015-03-26 17:03:19 UTC (rev 35466)
@@ -347,7 +347,7 @@
int
GNUNET_REST_jsonapi_object_resource_count (struct JsonApiObject *resp)
{
- return resp->res_count++;
+ return resp->res_count;
}
/**
@@ -412,7 +412,6 @@
return GNUNET_SYSERR;
root_json = json_object ();
-
if (1 == resp->res_count)
{
json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA,
resp->res_list_head->res_obj);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35466 - in gnunet/src: identity rest,
gnunet <=