Rework to ommit unneeded activity fields, add -Werror

.builder.options.rb

@@ -1,2 +1,2 @@
-FLAGS="-g -MP -MD -Os"
+FLAGS="-g -MP -MD -Os -Werror"
 LDFLAGS = "-lcurl -lssl -lcrypto"

src/json

@@ -1 +1 @@
-Subproject commit 2499319c2c357fe2bc7f2a340299fd17bfeca2b4
+Subproject commit cd0c17e6b9d1c524096c71e8b30d4a2ce1b9a262

src/model/account.c

@@ -90,9 +90,11 @@ struct reverse_index_entry
 		}
 		return res;
 	}
-	void rie_writer( struct json_writer* jpp, void* field_data, struct json_object_field* layout_field_data )
+	bool rie_writer( struct json_writer* jw, const char* field_name, void* field_data, struct json_object_field* layout_field_data )
 	{
-		json_write_pretty_object_layout( jpp, reverse_index_entry_layout, *(void**)field_data );
+		json_write_field_name(jw,field_name);
+		json_write_pretty_object_layout( jw, reverse_index_entry_layout, *(void**)field_data );
+		return true;
 	}
 
 	struct json_field_type reverse_index_entry_type = {

src/model/ap/activity.c

@@ -73,14 +73,15 @@ struct ap_activity* ap_activity_dup( struct ap_activity* act )
 	}
 	new_act->object.tag = act->object.tag;
 
-	new_act->signature.type = act->signature.type;
-	if( act->signature.creator ) {
+	if( act->state ) {
+		new_act->state = strdup( act->state );
+	}
+
+	if( act->has_signature ) {
+		new_act->has_signature = true;
+		new_act->signature.type = act->signature.type;
 		new_act->signature.creator = strdup(act->signature.creator);
-	};
-	if( act->signature.created ) {
 		new_act->signature.created = strdup(act->signature.created);
-	}
-	if( act->signature.value ) {
 		new_act->signature.value = strdup(act->signature.value);
 	}
 
@@ -125,6 +126,7 @@ void ap_activity_free_composite( struct ap_activity* act )
 			act->object.ptr = 0;
 			break;
 	};
+	free( act->state );
 
 	free( act->signature.creator );
 	free( act->signature.created );
@@ -149,20 +151,26 @@ struct json_object_field activity_ref_types[] = {
 	{ (char*)apaot_activity,		offsetof( struct ap_activity, object.ptr ),	false,	&json_field_object_pointer, ap_activity_layout },
 	{ NULL },
 };
+struct json_object_field signature_types[] = {
+	{ (char*)1,		offsetof( struct ap_activity, signature ),	false,  &json_field_object_composite, ap_signature_layout },
+	{ NULL },
+};
 
 struct json_object_field ap_activity_layout[] = {
 	{ "id",			offsetof( struct ap_activity, id ),		true,  &json_field_string },
-	{ "type",			offsetof( struct ap_activity, type ),		true,  &json_field_enum, ap_activity_type_enum },
 	{ "actor",		offsetof( struct ap_activity, actor ),		true,  &json_field_string },
+	{ "state",		offsetof( struct ap_activity, state ),		false, &json_field_string },
+
 	{ "to",			offsetof( struct ap_activity, to ),		true,  &json_field_array_of, &json_field_string },
 	{ "cc",			offsetof( struct ap_activity, cc ),		false, &json_field_array_of, &json_field_string },
 	{ "bcc",			offsetof( struct ap_activity, bcc ),		false, &json_field_array_of, &json_field_string },
 
-	{ "object",		offsetof( struct ap_activity, object.tag ),	false, &json_field_tagged_union, &activity_ref_types },
+	{ "object",		offsetof( struct ap_activity, object.tag ),		false, &json_field_tagged_union, &activity_ref_types },
+
+	{ "signature",		offsetof( struct ap_activity, has_signature ),	false, &json_field_tagged_union, &signature_types },
+
+	{ "type",			offsetof( struct ap_activity, type ),		true,  &json_field_enum, ap_activity_type_enum },
 
-	//{ "object",		offsetof( struct ap_activity, object.ref ),	false, &json_field_string },
-	//{ "object",		offsetof( struct ap_activity, object.ptr ),	false, &json_field_object_pointer, ap_activity_layout },
-	{ "signature",		offsetof( struct ap_activity, signature ),	false,  &json_field_object_composite, ap_signature_layout },
 	{ NULL, 			0,									true,  NULL,	&ap_activity_type },
 };
 
@@ -195,6 +203,7 @@ struct ap_activity* ap_activity_create_accept( struct ap_activity* act )
 	array_append( &accept->to, sizeof(char*), &new_act_actor );
 	accept->object.tag = apaot_activity;
 	accept->object.ptr = ap_activity_dup(act);
+	accept->has_signature = 1;
 	accept->signature.type = apst_rsa_signature_2017;
 	accept->signature.creator = strdup(actor);
 	accept->signature.created = strdup("TBD");

src/model/ap/activity.h

@@ -44,6 +44,9 @@ struct ap_activity
 			struct ap_activity* ptr;
 		};
 	} object;
+	char* state;
+
+	int has_signature;
 	struct ap_signature signature;
 };