Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tweak clang-format configuration a bit 
Set ColumnLimit to 90, remove AllowShortCaseLabelsOnASingleLine.
  • Loading branch information
@akheron
akheron committed Oct 21, 2019
1 parent 7c0297a commit a8f5fa5
Show file tree
Hide file tree
Showing 30 changed files with 577 additions and 606 deletions.
2 changes: 1 addition & 1 deletion .clang-format
View file
@@ -1,5 +1,5 @@
BasedOnStyle: LLVM
AlignConsecutiveMacros: true
AllowShortCaseLabelsOnASingleLine: true
ColumnLimit: 90
IndentCaseLabels: true
IndentWidth: 4
19 changes: 7 additions & 12 deletions doc/github_commits.c
View file
Expand Up @@ -31,8 +31,7 @@ struct write_result {
int pos;
};

static size_t write_response(void *ptr, size_t size, size_t nmemb,
void *stream) {
static size_t write_response(void *ptr, size_t size, size_t nmemb, void *stream) {
struct write_result *result = (struct write_result *)stream;

if (result->pos + size * nmemb >= BUFFER_SIZE - 1) {
Expand Down Expand Up @@ -146,38 +145,34 @@ int main(int argc, char *argv[]) {

data = json_array_get(root, i);
if (!json_is_object(data)) {
fprintf(stderr, "error: commit data %d is not an object\n",
(int)(i + 1));
fprintf(stderr, "error: commit data %d is not an object\n", (int)(i + 1));
json_decref(root);
return 1;
}

sha = json_object_get(data, "sha");
if (!json_is_string(sha)) {
fprintf(stderr, "error: commit %d: sha is not a string\n",
(int)(i + 1));
fprintf(stderr, "error: commit %d: sha is not a string\n", (int)(i + 1));
return 1;
}

commit = json_object_get(data, "commit");
if (!json_is_object(commit)) {
fprintf(stderr, "error: commit %d: commit is not an object\n",
(int)(i + 1));
fprintf(stderr, "error: commit %d: commit is not an object\n", (int)(i + 1));
json_decref(root);
return 1;
}

message = json_object_get(commit, "message");
if (!json_is_string(message)) {
fprintf(stderr, "error: commit %d: message is not a string\n",
(int)(i + 1));
fprintf(stderr, "error: commit %d: message is not a string\n", (int)(i + 1));
json_decref(root);
return 1;
}

message_text = json_string_value(message);
printf("%.8s %.*s\n", json_string_value(sha),
newline_offset(message_text), message_text);
printf("%.8s %.*s\n", json_string_value(sha), newline_offset(message_text),
message_text);
}

json_decref(root);
Expand Down
38 changes: 26 additions & 12 deletions examples/simple_parse.c
View file
Expand Up @@ -44,17 +44,32 @@ void print_json(json_t *root) { print_json_aux(root, 0); }

void print_json_aux(json_t *element, int indent) {
switch (json_typeof(element)) {
case JSON_OBJECT: print_json_object(element, indent); break;
case JSON_ARRAY: print_json_array(element, indent); break;
case JSON_STRING: print_json_string(element, indent); break;
case JSON_INTEGER: print_json_integer(element, indent); break;
case JSON_REAL: print_json_real(element, indent); break;
case JSON_TRUE: print_json_true(element, indent); break;
case JSON_FALSE: print_json_false(element, indent); break;
case JSON_NULL: print_json_null(element, indent); break;
case JSON_OBJECT:
print_json_object(element, indent);
break;
case JSON_ARRAY:
print_json_array(element, indent);
break;
case JSON_STRING:
print_json_string(element, indent);
break;
case JSON_INTEGER:
print_json_integer(element, indent);
break;
case JSON_REAL:
print_json_real(element, indent);
break;
case JSON_TRUE:
print_json_true(element, indent);
break;
case JSON_FALSE:
print_json_false(element, indent);
break;
case JSON_NULL:
print_json_null(element, indent);
break;
default:
fprintf(stderr, "unrecognized JSON type %d\n",
json_typeof(element));
fprintf(stderr, "unrecognized JSON type %d\n", json_typeof(element));
}
}

Expand Down Expand Up @@ -101,8 +116,7 @@ void print_json_string(json_t *element, int indent) {

void print_json_integer(json_t *element, int indent) {
print_json_indent(indent);
printf("JSON Integer: \"%" JSON_INTEGER_FORMAT "\"\n",
json_integer_value(element));
printf("JSON Integer: \"%" JSON_INTEGER_FORMAT "\"\n", json_integer_value(element));
}

void print_json_real(json_t *element, int indent) {
Expand Down
89 changes: 52 additions & 37 deletions src/dump.c
View file
Expand Up @@ -68,19 +68,17 @@ static int dump_to_fd(const char *buffer, size_t size, void *data) {
/* 32 spaces (the maximum indentation size) */
static const char whitespace[] = " ";

static int dump_indent(size_t flags, int depth, int space,
json_dump_callback_t dump, void *data) {
static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump,
void *data) {
if (FLAGS_TO_INDENT(flags) > 0) {
unsigned int ws_count = FLAGS_TO_INDENT(flags),
n_spaces = depth * ws_count;
unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;

if (dump("\n", 1, data))
return -1;

while (n_spaces > 0) {
int cur_n = n_spaces < sizeof whitespace - 1
? n_spaces
: sizeof whitespace - 1;
int cur_n =
n_spaces < sizeof whitespace - 1 ? n_spaces : sizeof whitespace - 1;

if (dump(whitespace, cur_n, data))
return -1;
Expand All @@ -93,8 +91,8 @@ static int dump_indent(size_t flags, int depth, int space,
return 0;
}

static int dump_string(const char *str, size_t len, json_dump_callback_t dump,
void *data, size_t flags) {
static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data,
size_t flags) {
const char *pos, *end, *lim;
int32_t codepoint = 0;

Expand Down Expand Up @@ -139,19 +137,34 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump,
/* handle \, /, ", and control codes */
length = 2;
switch (codepoint) {
case '\\': text = "\\\\"; break;
case '\"': text = "\\\""; break;
case '\b': text = "\\b"; break;
case '\f': text = "\\f"; break;
case '\n': text = "\\n"; break;
case '\r': text = "\\r"; break;
case '\t': text = "\\t"; break;
case '/': text = "\\/"; break;
case '\\':
text = "\\\\";
break;
case '\"':
text = "\\\"";
break;
case '\b':
text = "\\b";
break;
case '\f':
text = "\\f";
break;
case '\n':
text = "\\n";
break;
case '\r':
text = "\\r";
break;
case '\t':
text = "\\t";
break;
case '/':
text = "\\/";
break;
default: {
/* codepoint is in BMP */
if (codepoint < 0x10000) {
snprintf(seq, sizeof(seq), "\\u%04X",
(unsigned int)codepoint);
snprintf(seq, sizeof(seq), "\\u%04X", (unsigned int)codepoint);
length = 6;
}

Expand All @@ -163,8 +176,8 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump,
first = 0xD800 | ((codepoint & 0xffc00) >> 10);
last = 0xDC00 | (codepoint & 0x003ff);

snprintf(seq, sizeof(seq), "\\u%04X\\u%04X",
(unsigned int)first, (unsigned int)last);
snprintf(seq, sizeof(seq), "\\u%04X\\u%04X", (unsigned int)first,
(unsigned int)last);
length = 12;
}

Expand All @@ -186,9 +199,8 @@ static int compare_keys(const void *key1, const void *key2) {
return strcmp(*(const char **)key1, *(const char **)key2);
}

static int do_dump(const json_t *json, size_t flags, int depth,
hashtable_t *parents, json_dump_callback_t dump,
void *data) {
static int do_dump(const json_t *json, size_t flags, int depth, hashtable_t *parents,
json_dump_callback_t dump, void *data) {
int embed = flags & JSON_EMBED;

flags &= ~JSON_EMBED;
Expand All @@ -197,18 +209,21 @@ static int do_dump(const json_t *json, size_t flags, int depth,
return -1;

switch (json_typeof(json)) {
case JSON_NULL: return dump("null", 4, data);
case JSON_NULL:
return dump("null", 4, data);

case JSON_TRUE: return dump("true", 4, data);
case JSON_TRUE:
return dump("true", 4, data);

case JSON_FALSE: return dump("false", 5, data);
case JSON_FALSE:
return dump("false", 5, data);

case JSON_INTEGER: {
char buffer[MAX_INTEGER_STR_LENGTH];
int size;

size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
"%" JSON_INTEGER_FORMAT, json_integer_value(json));
size = snprintf(buffer, MAX_INTEGER_STR_LENGTH, "%" JSON_INTEGER_FORMAT,
json_integer_value(json));
if (size < 0 || size >= MAX_INTEGER_STR_LENGTH)
return -1;

Expand All @@ -229,8 +244,8 @@ static int do_dump(const json_t *json, size_t flags, int depth,
}

case JSON_STRING:
return dump_string(json_string_value(json),
json_string_length(json), dump, data, flags);
return dump_string(json_string_value(json), json_string_length(json), dump,
data, flags);

case JSON_ARRAY: {
size_t n;
Expand All @@ -255,8 +270,8 @@ static int do_dump(const json_t *json, size_t flags, int depth,
return -1;

for (i = 0; i < n; ++i) {
if (do_dump(json_array_get(json, i), flags, depth + 1, parents,
dump, data))
if (do_dump(json_array_get(json, i), flags, depth + 1, parents, dump,
data))
return -1;

if (i < n - 1) {
Expand Down Expand Up @@ -360,8 +375,8 @@ static int do_dump(const json_t *json, size_t flags, int depth,

dump_string(key, strlen(key), dump, data, flags);
if (dump(separator, separator_length, data) ||
do_dump(json_object_iter_value(iter), flags, depth + 1,
parents, dump, data))
do_dump(json_object_iter_value(iter), flags, depth + 1, parents,
dump, data))
return -1;

if (next) {
Expand Down Expand Up @@ -435,8 +450,8 @@ int json_dump_file(const json_t *json, const char *path, size_t flags) {
return result;
}

int json_dump_callback(const json_t *json, json_dump_callback_t callback,
void *data, size_t flags) {
int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data,
size_t flags) {
int res;
hashtable_t parents_set;

Expand Down
5 changes: 2 additions & 3 deletions src/error.c
View file
Expand Up @@ -39,9 +39,8 @@ void jsonp_error_set(json_error_t *error, int line, int column, size_t position,
va_end(ap);
}

void jsonp_error_vset(json_error_t *error, int line, int column,
size_t position, enum json_error_code code,
const char *msg, va_list ap) {
void jsonp_error_vset(json_error_t *error, int line, int column, size_t position,
enum json_error_code code, const char *msg, va_list ap) {
if (!error)
return;

Expand Down
21 changes: 7 additions & 14 deletions src/hashtable.c
View file
Expand Up @@ -54,13 +54,11 @@ static JSON_INLINE void list_remove(list_t *list) {
list->next->prev = list->prev;
}

static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable,
bucket_t *bucket) {
static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket) {
return bucket->first == &hashtable->list && bucket->first == bucket->last;
}

static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
list_t *list) {
static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket, list_t *list) {
if (bucket_is_empty(hashtable, bucket)) {
list_insert(&hashtable->list, list);
bucket->first = bucket->last = list;
Expand Down Expand Up @@ -94,8 +92,7 @@ static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
}

/* returns 0 on success, -1 if key was not found */
static int hashtable_do_del(hashtable_t *hashtable, const char *key,
size_t hash) {
static int hashtable_do_del(hashtable_t *hashtable, const char *key, size_t hash) {
pair_t *pair;
bucket_t *bucket;
size_t index;
Expand Down Expand Up @@ -156,8 +153,7 @@ static int hashtable_do_rehash(hashtable_t *hashtable) {
hashtable->order = new_order;

for (i = 0; i < hashsize(hashtable->order); i++) {
hashtable->buckets[i].first = hashtable->buckets[i].last =
&hashtable->list;
hashtable->buckets[i].first = hashtable->buckets[i].last = &hashtable->list;
}

list = hashtable->list.next;
Expand All @@ -178,17 +174,15 @@ int hashtable_init(hashtable_t *hashtable) {

hashtable->size = 0;
hashtable->order = INITIAL_HASHTABLE_ORDER;
hashtable->buckets =
jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
hashtable->buckets = jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
if (!hashtable->buckets)
return -1;

list_init(&hashtable->list);
list_init(&hashtable->ordered_list);

for (i = 0; i < hashsize(hashtable->order); i++) {
hashtable->buckets[i].first = hashtable->buckets[i].last =
&hashtable->list;
hashtable->buckets[i].first = hashtable->buckets[i].last = &hashtable->list;
}

return 0;
Expand Down Expand Up @@ -272,8 +266,7 @@ void hashtable_clear(hashtable_t *hashtable) {
hashtable_do_clear(hashtable);

for (i = 0; i < hashsize(hashtable->order); i++) {
hashtable->buckets[i].first = hashtable->buckets[i].last =
&hashtable->list;
hashtable->buckets[i].first = hashtable->buckets[i].last = &hashtable->list;
}

list_init(&hashtable->list);
Expand Down
2 changes: 1 addition & 1 deletion src/hashtable.h
View file
Expand Up @@ -40,7 +40,7 @@ typedef struct hashtable {
struct hashtable_list ordered_list;
} hashtable_t;

#define hashtable_key_to_iter(key_) \
#define hashtable_key_to_iter(key_) \
(&(container_of(key_, struct hashtable_pair, key)->ordered_list))

/**
Expand Down

0 comments on commit a8f5fa5

Please sign in to comment.