ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-22 10:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cosmetic: rename variable 'result' to 'http_status'

Browse Source 
For more consistency with standard terminology.
This commit is contained in:
Andrew Bettison 2015-12-07 11:22:45 +10:30
parent aabb1c5547
commit cc26dd99e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rhizome_restful.c
View File

@ -722,13 +722,13 @@ static int restful_rhizome_insert_end(struct http_request *hr)
rhizome_manifest *mout = NULL; rhizome_manifest *mout = NULL;
rhizome_bundle_result_free(&r->bundle_result); rhizome_bundle_result_free(&r->bundle_result);
r->bundle_result.status = rhizome_manifest_finalise(r->manifest, &mout, !r->u.insert.force_new); r->bundle_result.status = rhizome_manifest_finalise(r->manifest, &mout, !r->u.insert.force_new);
int result = 500; int http_status = 500;
DEBUGF(rhizome, "r->bundle_result = %s", alloca_rhizome_bundle_result(r->bundle_result)); DEBUGF(rhizome, "r->bundle_result = %s", alloca_rhizome_bundle_result(r->bundle_result));
switch (r->bundle_result.status) { switch (r->bundle_result.status) {
case RHIZOME_BUNDLE_STATUS_NEW: case RHIZOME_BUNDLE_STATUS_NEW:
if (mout && mout != r->manifest) if (mout && mout != r->manifest)
rhizome_manifest_free(mout); rhizome_manifest_free(mout);
result = 201; http_status = 201;
break; break;
case RHIZOME_BUNDLE_STATUS_SAME: case RHIZOME_BUNDLE_STATUS_SAME:
case RHIZOME_BUNDLE_STATUS_OLD: case RHIZOME_BUNDLE_STATUS_OLD:
@ -737,7 +737,7 @@ static int restful_rhizome_insert_end(struct http_request *hr)
rhizome_manifest_free(r->manifest); rhizome_manifest_free(r->manifest);
r->manifest = mout; r->manifest = mout;
} }
result = 201; http_status = 201;
break; break;
case RHIZOME_BUNDLE_STATUS_ERROR: case RHIZOME_BUNDLE_STATUS_ERROR:
r->bundle_result.message = "Error in manifest finalise"; r->bundle_result.message = "Error in manifest finalise";
@ -754,10 +754,10 @@ static int restful_rhizome_insert_end(struct http_request *hr)
r->manifest = NULL; r->manifest = NULL;
return http_request_rhizome_response(r, 0, NULL); return http_request_rhizome_response(r, 0, NULL);
} }
if (result == 500) if (http_status == 500)
FATALF("rhizome_manifest_finalise() returned status = %d", r->bundle_result.status); FATALF("rhizome_manifest_finalise() returned status = %d", r->bundle_result.status);
rhizome_authenticate_author(r->manifest); rhizome_authenticate_author(r->manifest);
http_request_response_static(&r->http, result, "rhizome-manifest/text", http_request_response_static(&r->http, http_status, "rhizome-manifest/text",
(const char *)r->manifest->manifestdata, r->manifest->manifest_all_bytes (const char *)r->manifest->manifestdata, r->manifest->manifest_all_bytes
); );
return 0; return 0;