enh: csv-related parameters code indent adjustment

This commit is contained in:
Yaming Pei 2025-02-21 17:08:33 +08:00
parent b93428432c
commit a1b7986cbd
1 changed files with 23 additions and 29 deletions

View File

@ -335,45 +335,39 @@ static long validate_csv_ts_interval(const char* csv_ts_interval) {
static int csvParseParameter() { static int csvParseParameter() {
// csv_output_path // csv_output_path
{ size_t len = strlen(g_arguments->csv_output_path);
size_t len = strlen(g_arguments->csv_output_path); if (len == 0) {
if (len == 0) { errorPrint("Failed to generate CSV, the specified output path is empty. Please provide a valid path. database: %s, super table: %s.\n",
errorPrint("Failed to generate CSV, the specified output path is empty. Please provide a valid path. database: %s, super table: %s.\n", db->dbName, stb->stbName);
db->dbName, stb->stbName); return -1;
}
if (g_arguments->csv_output_path[len - 1] != '/') {
int n = snprintf(g_arguments->csv_output_path_buf, sizeof(g_arguments->csv_output_path_buf), "%s/", g_arguments->csv_output_path);
if (n < 0 || n >= sizeof(g_arguments->csv_output_path_buf)) {
errorPrint("Failed to generate CSV, path buffer overflow risk when appending '/'. path: %s, database: %s, super table: %s.\n",
g_arguments->csv_output_path db->dbName, stb->stbName);
return -1; return -1;
} }
if (g_arguments->csv_output_path[len - 1] != '/') { g_arguments->csv_output_path = g_arguments->csv_output_path_buf;
int n = snprintf(g_arguments->csv_output_path_buf, sizeof(g_arguments->csv_output_path_buf), "%s/", g_arguments->csv_output_path);
if (n < 0 || n >= sizeof(g_arguments->csv_output_path_buf)) {
errorPrint("Failed to generate CSV, path buffer overflow risk when appending '/'. path: %s, database: %s, super table: %s.\n",
g_arguments->csv_output_path db->dbName, stb->stbName);
return -1;
}
g_arguments->csv_output_path = g_arguments->csv_output_path_buf;
}
} }
// csv_ts_format // csv_ts_format
{ if (g_arguments->csv_ts_format) {
if (g_arguments->csv_ts_format) { if (is_valid_csv_ts_format(g_arguments->csv_ts_format) != 0) {
if (is_valid_csv_ts_format(g_arguments->csv_ts_format) != 0) { errorPrint("Failed to generate CSV, the parameter `csv_ts_format` is invalid. csv_ts_format: %s, database: %s, super table: %s.\n",
errorPrint("Failed to generate CSV, the parameter `csv_ts_format` is invalid. csv_ts_format: %s, database: %s, super table: %s.\n", g_arguments->csv_ts_format, db->dbName, stb->stbName);
g_arguments->csv_ts_format, db->dbName, stb->stbName); return -1;
return -1;
}
} }
} }
// csv_ts_interval // csv_ts_interval
{ long csv_ts_intv_secs = validate_csv_ts_interval(g_arguments->csv_ts_interval);
long csv_ts_intv_secs = validate_csv_ts_interval(g_arguments->csv_ts_interval); if (csv_ts_intv_secs <= 0) {
if (csv_ts_intv_secs <= 0) { errorPrint("Failed to generate CSV, the parameter `csv_ts_interval` is invalid. csv_ts_interval: %s, database: %s, super table: %s.\n",
errorPrint("Failed to generate CSV, the parameter `csv_ts_interval` is invalid. csv_ts_interval: %s, database: %s, super table: %s.\n", g_arguments->csv_ts_interval, db->dbName, stb->stbName);
g_arguments->csv_ts_interval, db->dbName, stb->stbName); return -1;
return -1;
}
g_arguments->csv_ts_intv_secs = csv_ts_intv_secs;
} }
g_arguments->csv_ts_intv_secs = csv_ts_intv_secs;
return 0; return 0;
} }