From 8fda1b6d53355bb4b8104d296252ff5aa39ba651 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 11 Aug 2023 14:06:12 +0800
Subject: [PATCH] modify OPTVAL::name type

---
 hgsane/sane_hg_mdw.cpp                | 6 +++---
 sdk/hginclude/huagaoxxx_warraper_ex.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp
index b3ebaca..4037353 100644
--- a/hgsane/sane_hg_mdw.cpp
+++ b/hgsane/sane_hg_mdw.cpp
@@ -2437,7 +2437,7 @@ OPTEN* hg_sane_middleware::get_control_enalbe_data(LPDEVINST dev, const SLAVEOP&
 	bzero(opt, size);
 
 	opt->enabled = slave.enable_now;
-	opt->name = slave.name;
+	strcpy(opt->name, slave.name.c_str());
 	opt->master_count = 0;
 	for (size_t i = 0; i < master.size(); ++i)
 	{
@@ -2445,7 +2445,7 @@ OPTEN* hg_sane_middleware::get_control_enalbe_data(LPDEVINST dev, const SLAVEOP&
 		if (m == dev->cur_vals.end())
 			continue;
 
-		opt->master[opt->master_count].name = master[i];
+		strcpy(opt->master[opt->master_count].name, master[i].c_str());
 		if (m->type == "string")
 		{
 			opt->master[opt->master_count].data = malloc(m->val.length() + 4);
@@ -2460,8 +2460,8 @@ OPTEN* hg_sane_middleware::get_control_enalbe_data(LPDEVINST dev, const SLAVEOP&
 				*((int*)opt->master[opt->master_count].data) = atoi(m->val.c_str());
 			else
 				*((double*)opt->master[opt->master_count].data) = atof(m->val.c_str());
-			opt->master_count++;
 		}
+		opt->master_count++;
 	}
 
 	return opt;
diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h
index f76b00b..1aa1b9b 100644
--- a/sdk/hginclude/huagaoxxx_warraper_ex.h
+++ b/sdk/hginclude/huagaoxxx_warraper_ex.h
@@ -178,12 +178,12 @@ enum hg_control_code
 };
 typedef struct _opt_val
 {
-	std::string name;				// 配置项名称
-	void*		data;				// 配置项数据
+	char	 name[MAX_OPT_NAME_LEN];// 配置项名称
+	void*	data;					// 配置项数据
 }OPTVAL;
 typedef struct _opt_enabled			// 配置项使能状态改变
 {
-	std::string name;				// 配置项名称
+	char	 name[MAX_OPT_NAME_LEN];// 配置项名称
 	int			enabled;			// 0 - 禁止；1 - 可用
 	int			master_count;		// 该配置项的依赖项数目
 	OPTVAL		master[1];			// 该配置项的依赖项当前值