Merge pull request #2581 from fengzeroz/main

fix: arm32 compile error
This commit is contained in:
fengzeroz
2025-10-20 14:53:57 +08:00
committed by GitHub
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -925,14 +925,14 @@ void handle_export_db(nng_aio *aio)
utarray_free(nodes);
system("rm -rf neuron.tar.gz");
system("tar -zcf neuron.tar.gz nodes.csv settings.csv groups.csv tags.csv "
system("rm -rf neuron.zip");
system("zip neuron.zip nodes.csv settings.csv groups.csv tags.csv "
"subscribes.csv");
void * data = NULL;
size_t len = 0;
rv = read_file("neuron.tar.gz", &data, &len);
rv = read_file("neuron.zip", &data, &len);
if (rv != 0) {
NEU_JSON_RESPONSE_ERROR(NEU_ERR_FILE_READ_FAILURE, {
neu_http_response(aio, error_code.error, result_error);
@@ -940,6 +940,6 @@ void handle_export_db(nng_aio *aio)
return;
}
neu_http_response_file(aio, data, len,
"attachment; filename=\"neuron.tar.gz\"");
"attachment; filename=\"neuron.zip\"");
free(data);
}
+1 -1
View File
@@ -211,7 +211,7 @@ void neu_tpy_to_msg(char *driver, tpy_t *tpy, neu_req_add_gtag_t *cmd)
to_neu_type(tpy->statics[i].vars[k].type);
cmd->groups[i].tags[k].attribute =
NEU_ATTRIBUTE_READ | NEU_ATTRIBUTE_WRITE;
snprintf(address, sizeof(address) - 1, "%ld,%ld",
snprintf(address, sizeof(address) - 1, "%" PRIi64 ",%" PRIi64,
tpy->statics[i].vars[k].igroup,
tpy->statics[i].vars[k].ioffset);
cmd->groups[i].tags[k].address = strdup(address);