goldenkrew3000/OSSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed fetching object names using the dynamic linker in OSS_P-oj functions

Browse Source
This commit is contained in:
Goldenkrew3000
2026-04-19 19:46:11 +10:00
parent 44cd9fd2e2
commit ba9a08cb85
1 changed files with 4 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libopensubsonic/utils.c
+4 -57
View File
@@ -1,7 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dlfcn.h>
#include "../external/cJSON.h"
#include "logger.h"
#include "utils.h"
@@ -15,91 +14,39 @@
*/
void OSS_Psoj(char** dest, cJSON* obj, char* child) {
if (obj == NULL) {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Parent object is null.");
//}
} else {
if (obj != NULL) {
cJSON* childObj = cJSON_GetObjectItem(obj, child);
if (cJSON_IsString(childObj) && childObj->valuestring != NULL) {
*dest = strdup(childObj->valuestring);
} else {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Object %s is not a string or string is null.", child);
//}
}
}
}
void OSS_Pioj(int* dest, cJSON* obj, char* child) {
if (obj == NULL) {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Parent object is null.");
//}
} else {
if (obj != NULL) {
cJSON* childObj = cJSON_GetObjectItem(obj, child);
if (cJSON_IsNumber(childObj)) {
*dest = childObj->valueint;
} else {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Object %s is not an int.", child);
//}
}
}
}
void OSS_Ploj(long* dest, cJSON* obj, char* child) {
if (obj == NULL) {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Parent object is null.");
//}
} else {
if (obj != NULL) {
cJSON* childObj = cJSON_GetObjectItem(obj, child);
if (cJSON_IsNumber(childObj)) {
*dest = childObj->valueint;
} else {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Object %s is not a long.", child);
//}
}
}
}
void OSS_Pboj(bool* dest, cJSON* obj, char* child) {
if (obj == NULL) {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Parent object is null.");
//}
} else {
if (obj != NULL) {
cJSON* childObj = cJSON_GetObjectItem(obj, child);
if (cJSON_IsBool(childObj)) {
if (cJSON_IsTrue(childObj)) {
*dest = true;
}
} else {
//void* ret_addr = __builtin_return_address(0);
//Dl_info info;
//if (dladdr(ret_addr, &info)) {
// logger_log_error(info.dli_sname, "Object is not a bool.");
//}
}
}
}