projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notices for 2011
[jansson.git]
/
src
/
value.c
diff --git
a/src/value.c
b/src/value.c
index
bbc43c8
..
0df4570
100644
(file)
--- a/
src/value.c
+++ b/
src/value.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009
, 2010
Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009
-2011
Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@
-7,8
+7,7
@@
#define _GNU_SOURCE
#define _GNU_SOURCE
-#include <config.h>
-
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-16,10
+15,9
@@
#include "hashtable.h"
#include "jansson_private.h"
#include "utf.h"
#include "hashtable.h"
#include "jansson_private.h"
#include "utf.h"
-#include "util.h"
-static
inline
void json_init(json_t *json, json_type type)
+static
JSON_INLINE
void json_init(json_t *json, json_type type)
{
json->type = type;
json->refcount = 1;
{
json->type = type;
json->refcount = 1;
@@
-124,9
+122,11
@@
int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
}
object = json_to_object(json);
}
object = json_to_object(json);
- k = malloc(sizeof(object_key_t) + strlen(key) + 1);
- if(!k)
- return -1;
+ /* offsetof(...) returns the size of object_key_t without the
+ last, flexible member. This way, the correct amount is
+ allocated. */
+ k = malloc(offsetof(object_key_t, key) +
+ strlen(key) + 1); if(!k) return -1;
k->serial = object->serial++;
strcpy(k->key, key);
k->serial = object->serial++;
strcpy(k->key, key);
@@
-725,7
+725,7
@@
static json_t *json_string_copy(json_t *string)
/*** integer ***/
/*** integer ***/
-json_t *json_integer(
in
t value)
+json_t *json_integer(
json_int_
t value)
{
json_integer_t *integer = malloc(sizeof(json_integer_t));
if(!integer)
{
json_integer_t *integer = malloc(sizeof(json_integer_t));
if(!integer)
@@
-736,7
+736,7
@@
json_t *json_integer(int value)
return &integer->json;
}
return &integer->json;
}
-
in
t json_integer_value(const json_t *json)
+
json_int_
t json_integer_value(const json_t *json)
{
if(!json_is_integer(json))
return 0;
{
if(!json_is_integer(json))
return 0;
@@
-744,7
+744,7
@@
int json_integer_value(const json_t *json)
return json_to_integer(json)->value;
}
return json_to_integer(json)->value;
}
-int json_integer_set(json_t *json,
in
t value)
+int json_integer_set(json_t *json,
json_int_
t value)
{
if(!json_is_integer(json))
return -1;
{
if(!json_is_integer(json))
return -1;
@@
-834,30
+834,21
@@
double json_number_value(const json_t *json)
json_t *json_true(void)
{
json_t *json_true(void)
{
- static json_t the_true = {
- .type = JSON_TRUE,
- .refcount = (size_t)-1
- };
+ static json_t the_true = {JSON_TRUE, (size_t)-1};
return &the_true;
}
json_t *json_false(void)
{
return &the_true;
}
json_t *json_false(void)
{
- static json_t the_false = {
- .type = JSON_FALSE,
- .refcount = (size_t)-1
- };
+ static json_t the_false = {JSON_FALSE, (size_t)-1};
return &the_false;
}
json_t *json_null(void)
{
return &the_false;
}
json_t *json_null(void)
{
- static json_t the_null = {
- .type = JSON_NULL,
- .refcount = (size_t)-1
- };
+ static json_t the_null = {JSON_NULL, (size_t)-1};
return &the_null;
}
return &the_null;
}