Z991239-4916 #comment 解决坑爹的花括号

Module/include/CommEntityUtil.hpp

@@ -866,44 +866,44 @@ static ErrorCodeEnum GetINETMacAddresses(CAutoArray<NetworkAdapterItem>& netList
 	toolkit_free_interface_addresses(info, count);
 
 	int fd, interface;
-	struct ifreq buf[16];
+	struct ifreq bufIfreq[16];
 	struct ifconf ifc;
 	char mac[32] = { 0 };
 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
 		int i = 0;
-		ifc.ifc_len = sizeof(buf);
-		ifc.ifc_buf = (caddr_t)buf;
+		ifc.ifc_len = sizeof(bufIfreq);
+		ifc.ifc_buf = (caddr_t)bufIfreq;
 		if (!ioctl(fd, SIOCGIFCONF, (char*)& ifc)) {
 			interface = ifc.ifc_len / sizeof(struct ifreq);
 			Dbg("interface num is %d", interface);
 			while (i < interface) {
-				Dbg("Name: %s", buf[i].ifr_name);
-				if (!(ioctl(fd, SIOCGIFHWADDR, (char*)& buf[i]))) {
+				Dbg("Name: %s", bufIfreq[i].ifr_name);
+				if (!(ioctl(fd, SIOCGIFHWADDR, (char*)& bufIfreq[i]))) {
 					sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X",
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[0],
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[1],
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[2],
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[3],
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[4],
-						(unsigned char)buf[i].ifr_hwaddr.sa_data[5]);
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[0],
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[1],
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[2],
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[3],
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[4],
+						(unsigned char)bufIfreq[i].ifr_hwaddr.sa_data[5]);
 					Dbg("HWaddr %s", mac);
-					inteMacs[buf[i].ifr_name] = mac;
+					inteMacs[bufIfreq[i].ifr_name] = mac;
 				}
 				struct ethtool_value edata;
 
 				edata.cmd = ETHTOOL_GLINK;
 				edata.data = 0;
-				buf[i].ifr_data = (char*)& edata;
+				bufIfreq[i].ifr_data = (char*)& edata;
 				//oiltmp@20231026 只检测了以太网卡
-				if (ioctl(fd, SIOCETHTOOL, (char*)& buf[i]) == -1) {
+				if (ioctl(fd, SIOCETHTOOL, (char*)& bufIfreq[i]) == -1) {
 					//up down
-					Dbg("Name: %s is down", buf[i].ifr_name);
-					inteStatus[buf[i].ifr_name] = 0;
+					Dbg("Name: %s is down", bufIfreq[i].ifr_name);
+					inteStatus[bufIfreq[i].ifr_name] = 0;
 				}
 				else
 				{
-					Dbg("Name: %s is up", buf[i].ifr_name);
-					inteStatus[buf[i].ifr_name] = 1;
+					Dbg("Name: %s is up", bufIfreq[i].ifr_name);
+					inteStatus[bufIfreq[i].ifr_name] = 1;
 				}
 				i++;
 			}