Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-15 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

use port_mem port_vprintf for jrpc

Browse Source
This commit is contained in:
Lyon 2024-07-06 21:19:40 +08:00
parent 65111629b2
commit f2ea203e2c
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/jrpc/jrpc.c
View File

@ -31,9 +31,10 @@
#include <string.h>
// Function pointers for memory management
static char* (*port_mem_strdup)(const char* str) = strdup;
static void* (*port_mem_malloc)(size_t size) = malloc;
static void (*port_mem_free)(void* ptr) = free;
static int (*port_vprintf)(const char* format, va_list args) = vprintf;
static void jrpc_debug(const char* format, ...) {
va_list args;
va_start(args, format);
@ -44,9 +45,9 @@ static void jrpc_debug(const char* format, ...) {
}
// API to set memory management functions
void set_jrpc_memory_functions(char* (*strdup_func)(const char*),
void set_jrpc_memory_functions(void* (*malloc_func)(size_t),
void (*free_func)(void*)) {
port_mem_strdup = strdup_func;
port_mem_malloc = malloc_func;
port_mem_free = free_func;
}
@ -55,7 +56,12 @@ void set_jrpc_vprintf_function(int (*vprintf_func)(const char*, va_list)) {
}
static char* jrpc_strdup(const char* str) {
return port_mem_strdup(str);
size_t len = strlen(str) + 1;
char* copy = (char*)port_mem_malloc(len);
if (copy) {
memcpy(copy, str, len);
}
return copy;
}
static void jrpc_free(void* ptr) {

2
package/jrpc/jrpc.h
View File

@ -113,7 +113,7 @@ cJSON* JRPC_receive_with_id_and_type(JRPC* self, int id, int type);
int jrpc_validate_response(const char* expected_response);
int jrpc_compare_json_strings(const char* json_str1, const char* json_str2);
int jrpc_validate_response(const char* expected_response);
void set_jrpc_memory_functions(char* (*strdup_func)(const char*),
void set_jrpc_memory_functions(void* (*malloc_func)(size_t),
void (*free_func)(void*));
void set_jrpc_vprintf_function(int (*vprintf_func)(const char*, va_list));

14
port/linux/package/pikascript/pikascript-lib/jrpc/jrpc.c
View File

@ -31,9 +31,10 @@
#include <string.h>
// Function pointers for memory management
static char* (*port_mem_strdup)(const char* str) = strdup;
static void* (*port_mem_malloc)(size_t size) = malloc;
static void (*port_mem_free)(void* ptr) = free;
static int (*port_vprintf)(const char* format, va_list args) = vprintf;
static void jrpc_debug(const char* format, ...) {
va_list args;
va_start(args, format);
@ -44,9 +45,9 @@ static void jrpc_debug(const char* format, ...) {
}
// API to set memory management functions
void set_jrpc_memory_functions(char* (*strdup_func)(const char*),
void set_jrpc_memory_functions(void* (*malloc_func)(size_t),
void (*free_func)(void*)) {
port_mem_strdup = strdup_func;
port_mem_malloc = malloc_func;
port_mem_free = free_func;
}
@ -55,7 +56,12 @@ void set_jrpc_vprintf_function(int (*vprintf_func)(const char*, va_list)) {
}
static char* jrpc_strdup(const char* str) {
return port_mem_strdup(str);
size_t len = strlen(str) + 1;
char* copy = (char*)port_mem_malloc(len);
if (copy) {
memcpy(copy, str, len);
}
return copy;
}
static void jrpc_free(void* ptr) {

2
port/linux/package/pikascript/pikascript-lib/jrpc/jrpc.h
View File

@ -113,7 +113,7 @@ cJSON* JRPC_receive_with_id_and_type(JRPC* self, int id, int type);
int jrpc_validate_response(const char* expected_response);
int jrpc_compare_json_strings(const char* json_str1, const char* json_str2);
int jrpc_validate_response(const char* expected_response);
void set_jrpc_memory_functions(char* (*strdup_func)(const char*),
void set_jrpc_memory_functions(void* (*malloc_func)(size_t),
void (*free_func)(void*));
void set_jrpc_vprintf_function(int (*vprintf_func)(const char*, va_list));