Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor rnp.cpp for less code duplication/reuse of ret_str_value(). #2264

Merged
merged 1 commit into from
Aug 24, 2024
Merged

Refactor rnp.cpp for less code duplication/reuse of ret_str_value(). #2264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 28 additions & 105 deletions src/lib/rnp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,32 +525,24 @@ hex_encode_value(const uint8_t *value, size_t len, char **res)
}

static rnp_result_t
get_map_value(const id_str_pair *map, int val, char **res)
ret_str_value(const char *str, char **res)
{
const char *str = id_str_pair::lookup(map, val, NULL);
if (!str) {
return RNP_ERROR_BAD_PARAMETERS;
}
char *strcp = strdup(str);
if (!strcp) {
*res = NULL; // LCOV_EXCL_LINE
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
*res = strcp;
return RNP_SUCCESS;
}

static rnp_result_t
ret_str_value(const char *str, char **res)
get_map_value(const id_str_pair *map, int val, char **res)
{
if (!str) {
return RNP_ERROR_BAD_PARAMETERS;
}
char *strcp = strdup(str);
if (!strcp) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
*res = strcp;
return RNP_SUCCESS;
return ret_str_value(id_str_pair::lookup(map, val, NULL), res);
}

static rnp_result_t
Expand Down Expand Up @@ -939,11 +931,7 @@ try {
if (home.empty()) {
return RNP_ERROR_NOT_SUPPORTED;
}
*homedir = strdup(home.c_str());
if (!*homedir) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
return RNP_SUCCESS;
return ret_str_value(home.c_str(), homedir);
}
FFI_GUARD

Expand Down Expand Up @@ -1018,30 +1006,21 @@ try {
return RNP_ERROR_SHORT_BUFFER;
}

*format = NULL;
// ordered from most reliable detection to least
const char *guess = NULL;
if (buf_len >= 12 && memcmp(buf + 8, "KBXf", 4) == 0) {
// KBX has a magic KBXf marker
guess = "KBX";
return ret_str_value("KBX", format);
} else if (buf_len >= 5 && memcmp(buf, "-----", 5) == 0) {
// likely armored GPG
guess = "GPG";
return ret_str_value("GPG", format);
} else if (buf[0] == '(') {
// G10 is s-exprs and should start end end with parentheses
guess = "G10";
return ret_str_value("G10", format);
} else if (buf[0] & PGP_PTAG_ALWAYS_SET) {
// this is harder to reliably determine, but could likely be improved
guess = "GPG";
return ret_str_value("GPG", format);
}
if (guess) {
*format = strdup(guess);
if (!*format) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
}

// success
*format = NULL;
return RNP_SUCCESS;
}
FFI_GUARD
Expand Down Expand Up @@ -1155,16 +1134,8 @@ try {
if (ret) {
return ret;
}

*result = (char *) json_object_to_json_string_ext(features, JSON_C_TO_STRING_PRETTY);
if (!*result) {
return RNP_ERROR_BAD_STATE; // LCOV_EXCL_LINE
}
*result = strdup(*result);
if (!*result) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
return RNP_SUCCESS;
return ret_str_value(json_object_to_json_string_ext(features, JSON_C_TO_STRING_PRETTY),
result);
}
FFI_GUARD

Expand Down Expand Up @@ -1782,18 +1753,11 @@ try {
return tmpret;
}
}

if (results) {
*results = (char *) json_object_to_json_string_ext(jsores, JSON_C_TO_STRING_PRETTY);
if (!*results) {
return RNP_ERROR_GENERIC; // LCOV_EXCL_LINE
}
*results = strdup(*results);
if (!*results) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
if (!results) {
return RNP_SUCCESS;
}
return RNP_SUCCESS;
return ret_str_value(json_object_to_json_string_ext(jsores, JSON_C_TO_STRING_PRETTY),
results);
}
FFI_GUARD

Expand Down Expand Up @@ -1883,18 +1847,11 @@ try {
return sigret; // LCOV_EXCL_LINE
}
}

if (results) {
*results = (char *) json_object_to_json_string_ext(jsores, JSON_C_TO_STRING_PRETTY);
if (!*results) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
*results = strdup(*results);
if (!*results) {
return RNP_ERROR_OUT_OF_MEMORY; // LCOV_EXCL_LINE
}
if (!results) {
return RNP_SUCCESS;
}
return RNP_SUCCESS;
return ret_str_value(json_object_to_json_string_ext(jsores, JSON_C_TO_STRING_PRETTY),
results);
}
FFI_GUARD

Expand Down Expand Up @@ -5828,11 +5785,7 @@ key_get_uid_at(pgp_key_t *key, size_t idx, char **uid)
if (idx >= key->uid_count()) {
return RNP_ERROR_BAD_PARAMETERS;
}
*uid = strdup(key->get_uid(idx).str.c_str());
if (!*uid) {
return RNP_ERROR_OUT_OF_MEMORY;
}
return RNP_SUCCESS;
return ret_str_value(key->get_uid(idx).str.c_str(), uid);
}

rnp_result_t
Expand Down Expand Up @@ -6899,12 +6852,7 @@ try {
if (!curve_type_to_str(_curve, &curvename)) {
return RNP_ERROR_BAD_PARAMETERS;
}
char *curvenamecp = strdup(curvename);
if (!curvenamecp) {
return RNP_ERROR_OUT_OF_MEMORY;
}
*curve = curvenamecp;
return RNP_SUCCESS;
return ret_str_value(curvename, curve);
}
FFI_GUARD

Expand Down Expand Up @@ -7203,12 +7151,7 @@ try {
if (!key || !key->revoked()) {
return RNP_ERROR_BAD_PARAMETERS;
}

*result = strdup(key->revocation().reason.c_str());
if (!*result) {
return RNP_ERROR_OUT_OF_MEMORY;
}
return RNP_SUCCESS;
return ret_str_value(key->revocation().reason.c_str(), result);
}
FFI_GUARD

Expand Down Expand Up @@ -8263,15 +8206,7 @@ try {
if ((ret = key_to_json(jso, handle, flags))) {
return ret;
}
*result = (char *) json_object_to_json_string_ext(jso, JSON_C_TO_STRING_PRETTY);
if (!*result) {
return ret;
}
*result = strdup(*result);
if (!*result) {
return RNP_ERROR_OUT_OF_MEMORY;
}
return RNP_SUCCESS;
return ret_str_value(json_object_to_json_string_ext(jso, JSON_C_TO_STRING_PRETTY), result);
}
FFI_GUARD

Expand All @@ -8290,23 +8225,12 @@ rnp_dump_src_to_json(pgp_source_t *src, uint32_t flags, char **result)
json_object *jso = NULL;
rnp_result_t ret = stream_dump_packets_json(&dumpctx, src, &jso);
if (ret) {
goto done;
}

*result = (char *) json_object_to_json_string_ext(jso, JSON_C_TO_STRING_PRETTY);
if (!*result) {
goto done;
}
*result = strdup(*result);
if (!*result) {
ret = RNP_ERROR_OUT_OF_MEMORY;
goto done;
json_object_put(jso);
return ret;
}

ret = RNP_SUCCESS;
done:
json_object_put(jso);
return ret;
rnp::JSONObject jsowrap(jso);
return ret_str_value(json_object_to_json_string_ext(jso, JSON_C_TO_STRING_PRETTY), result);
}

rnp_result_t
Expand All @@ -8333,7 +8257,6 @@ try {
if (!input || !result) {
return RNP_ERROR_NULL_POINTER;
}

return rnp_dump_src_to_json(&input->src, flags, result);
}
FFI_GUARD
Expand Down