修改ini功能添加默认返回

This commit is contained in:
sc committed 2025-12-14 01:37:39 +08:00
1 parent 4e5d32a3f4
commit a27c950c42
6 files changed
+15 -34

No files matched your search

+2 -2
View File
@@ -34,8 +34,8 @@ int read_write_sample(void)
return -1;
}
// 读取各种类型的值
strncpy(machine_ID, ini_get_value(ini, "CONFIG", "ID"),sizeof(machine_ID));
machine_name = ini_get_value(ini, "CONFIG", "NAME");
strncpy(machine_ID, ini_get_value(ini, "CONFIG", "ID","99"),sizeof(machine_ID));
machine_name = ini_get_value(ini, "CONFIG", "NAME","828");
//// ini_set_value(ini,"database", "host","192.168.9.1");
+5 -5
View File
@@ -233,7 +233,7 @@ int ini_delete_key(INI_File *ini, const char *section, const char *key) {
return -1; // 未找到
}
// 获取键值
char* ini_get_value(INI_File *ini, const char *section, const char *key) {
char* ini_get_value(INI_File *ini, const char *section, const char *key,char *def) {
for (int i = 0; i < ini->section_count; i++) {
if (strcmp(ini->sections[i].section, section) == 0) {
for (int j = 0; j < ini->sections[i].entry_count; j++) {
@@ -244,26 +244,26 @@ char* ini_get_value(INI_File *ini, const char *section, const char *key) {
break;
}
}
return NULL; // 未找到
return def; // 未找到
}
// 获取整数值
int ini_get_int(INI_File *ini, const char *section, const char *key, int default_value) {
const char *value = ini_get_value(ini, section, key);
const char *value = ini_get_value(ini, section, key,"0");
if (!value) return default_value;
return atoi(value);
}
// 获取浮点数值
double ini_get_double(INI_File *ini, const char *section, const char *key, double default_value) {
const char *value = ini_get_value(ini, section, key);
const char *value = ini_get_value(ini, section, key,"0");
if (!value) return default_value;
return atof(value);
}
// 获取布尔值
int ini_get_bool(INI_File *ini, const char *section, const char *key, int default_value) {
const char *value = ini_get_value(ini, section, key);
const char *value = ini_get_value(ini, section, key,"0");
if (!value) return default_value;
if (strcasecmp(value, "true") == 0 || strcasecmp(value, "yes") == 0 ||
+1 -1
View File
@@ -44,7 +44,7 @@ extern int ini_parse(INI_File *ini, const char *filename);
extern int ini_set_value(INI_File *ini, const char *section, const char *key, const char *value);
extern int ini_save(INI_File *ini, const char *filename);
extern int ini_delete_key(INI_File *ini, const char *section, const char *key);
extern char* ini_get_value(INI_File *ini, const char *section, const char *key);
extern char* ini_get_value(INI_File *ini, const char *section, const char *key,char *def);
extern int ini_get_int(INI_File *ini, const char *section, const char *key, int default_value);
extern double ini_get_double(INI_File *ini, const char *section, const char *key, double default_value);
extern int ini_get_bool(INI_File *ini, const char *section, const char *key, int default_value);
+1 -3
View File
@@ -9,10 +9,9 @@
*/
#include <rtthread.h>
#include <dfs_posix.h>
#include <light/RUN_LED.h>
#include "DB_SQLite.h"
#include "lcd.h"
#define DBG_TAG "main"
#define DBG_LVL DBG_LOG
#include <rtdbg.h>
@@ -25,6 +24,5 @@ int main(void)
thread_DB_SQLite();
thread_RUN_LED();//运行指示灯线程
return RT_EOK;
}