This file is part of GNUnet.
Copyright (C) 2012-2015 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
*/
/**
* @author Martin Schanzenbach
#include "platform.h"
#include "gnunet_rest_plugin.h"
+#include "gnunet_gns_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_identity_service.h"
#include "gnunet_rest_lib.h"
{
struct RecordEntry *record_entry;
struct RecordEntry *record_tmp;
- int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Cleaning up\n");
GNUNET_free (handle->value);
if (NULL != handle->rd)
{
- for (i = 0; i < handle->rd_count; i++)
+ for (unsigned int i = 0; i < handle->rd_count; i++)
{
if (NULL != handle->rd[i].data)
GNUNET_free ((void*)handle->rd[i].data);
struct GNUNET_JSONAPI_Resource *json_resource;
json_t *result_array;
json_t *record_obj;
- int i;
if (NULL == handle->resp_object)
handle->resp_object = GNUNET_JSONAPI_document_new ();
if ( (NULL != handle->name) &&
- (0 != strcmp (handle->name, rname)) )
+ (0 != strcmp (handle->name,
+ rname)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "%s does not match %s\n", rname, handle->name);
- GNUNET_NAMESTORE_zone_iterator_next (handle->list_it);
+ "%s does not match %s\n",
+ rname,
+ handle->name);
+ GNUNET_NAMESTORE_zone_iterator_next (handle->list_it,
+ 1);
return;
}
result_array = json_array ();
- for (i=0; i<rd_len; i++)
+ for (unsigned int i=0; i<rd_len; i++)
{
if ( (GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
- (0 != strcmp (rname, "+")) )
+ (0 != strcmp (rname, GNUNET_GNS_EMPTY_LABEL_AT)) )
continue;
if ( (rd[i].record_type != handle->type) &&
(GNUNET_GNSRECORD_TYPE_ANY != handle->type) )
continue;
- record_obj = gnsrecord_to_json (&(rd[i]));
- json_array_append (result_array, record_obj);
+ record_obj = gnsrecord_to_json (&rd[i]);
+ json_array_append (result_array,
+ record_obj);
json_decref (record_obj);
}
}
json_decref (result_array);
- GNUNET_NAMESTORE_zone_iterator_next (handle->list_it);
+ GNUNET_NAMESTORE_zone_iterator_next (handle->list_it,
+ 1);
}
size_t rdata_size;
const char *typestring;
const char *expirationstring;
- int i;
json_t *type_json;
json_t *value_json;
json_t *record_json;
json_t *exp_json;
*rd_count = json_array_size (records_json);
- *rd = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Data) * *rd_count);
- for (i = 0; i < *rd_count; i++)
+ *rd = GNUNET_new_array (*rd_count,
+ struct GNUNET_GNSRECORD_Data);
+ for (unsigned int i = 0; i < *rd_count; i++)
{
- memset (&((*rd)[i]), 0, sizeof (struct GNUNET_GNSRECORD_Data));
- record_json = json_array_get (records_json, i);
+ memset (&(*rd)[i],
+ 0,
+ sizeof (struct GNUNET_GNSRECORD_Data));
+ record_json = json_array_get (records_json,
+ i);
type_json = json_object_get (record_json,
GNUNET_REST_JSONAPI_NAMESTORE_RECORD_TYPE);
- if (!json_is_string (type_json))
+ if (! json_is_string (type_json))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Type property is no string\n");
}
value_json = json_object_get (record_json,
GNUNET_REST_JSONAPI_NAMESTORE_VALUE);
- if (!json_is_string (value_json))
+ if (! json_is_string (value_json))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Value property is no string\n");
return GNUNET_SYSERR;
}
value = GNUNET_strdup (json_string_value (value_json));
- if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value ((*rd)[i].record_type,
- value,
- &rdata,
- &rdata_size))
+ if (GNUNET_OK !=
+ GNUNET_GNSRECORD_string_to_value ((*rd)[i].record_type,
+ value,
+ &rdata,
+ &rdata_size))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Value `%s' invalid for record type `%s'\n"),
- value, typestring);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Value `%s' invalid for record type `%s'\n"),
+ value,
+ typestring);
return GNUNET_SYSERR;
}
(*rd)[i].data = rdata;
*/
exp_json = json_object_get (record_json,
GNUNET_REST_JSONAPI_NAMESTORE_EXPIRATION);
- if (!json_is_string (exp_json))
+ if (! json_is_string (exp_json))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expiration property is no string\n");
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Value `%s' invalid for record type `%s'\n"),
- value, typestring);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Value `%s' invalid for record type `%s'\n"),
+ value,
+ typestring);
return GNUNET_SYSERR;
}
}
projects / oweals / gnunet.git / blobdiff