--- np2/mona/ini.c	2005/02/04 05:45:46	1.1
+++ np2/mona/ini.c	2005/02/12 12:13:58	1.2
@@ -14,10 +14,10 @@ const INITBL	*tblterm;
 	UINT		count;
 } _INIARG, *INIARG;
 
-static void inirdarg8(BYTE *dst, int dsize, const char *src) {
+static void inirdarg8(UINT8 *dst, int dsize, const char *src) {
 
 	int		i;
-	BYTE	val;
+	UINT8	val;
 	BOOL	set;
 	char	c;
 
@@ -74,16 +74,16 @@ const INITBL	*p;
 					break;
 
 				case INITYPE_BOOL:
-					*((BYTE *)p->value) = (!milstr_cmp(data, str_true))?1:0;
+					*((UINT8 *)p->value) = (!milstr_cmp(data, str_true))?1:0;
 					break;
 
 				case INITYPE_BYTEARG:
-					inirdarg8((BYTE *)p->value, p->size, data);
+					inirdarg8((UINT8 *)p->value, p->size, data);
 					break;
 
 				case INITYPE_SINT8:
 				case INITYPE_UINT8:
-					*((BYTE *)p->value) = (BYTE)milstr_solveINT(data);
+					*((UINT8 *)p->value) = (UINT8)milstr_solveINT(data);
 					break;
 
 				case INITYPE_SINT16:
@@ -97,7 +97,7 @@ const INITBL	*p;
 					break;
 
 				case INITYPE_HEX8:
-					*((BYTE *)p->value) = (BYTE)milstr_solveHEX(data);
+					*((UINT8 *)p->value) = (UINT8)milstr_solveHEX(data);
 					break;
 
 				case INITYPE_HEX16:
@@ -177,7 +177,7 @@ iwss_extend:
 	}
 }
 
-static void iniwrsetarg8(char *work, int size, const BYTE *ptr, int arg) {
+static void iniwrsetarg8(char *work, int size, const UINT8 *ptr, int arg) {
 
 	int		i;
 	char	tmp[8];
@@ -221,12 +221,12 @@ const INITBL	*pterm;
 				break;
 
 			case INITYPE_BOOL:
-				milstr_ncpy(work, (*((BYTE *)p->value))?str_true:str_false,
+				milstr_ncpy(work, (*((UINT8 *)p->value))?str_true:str_false,
 																sizeof(work));
 				break;
 
 			case INITYPE_BYTEARG:
-				iniwrsetarg8(work, sizeof(work), (BYTE *)p->value, p->size);
+				iniwrsetarg8(work, sizeof(work), (UINT8 *)p->value, p->size);
 				break;
 
 			case INITYPE_SINT8:
@@ -242,7 +242,7 @@ const INITBL	*pterm;
 				break;
 
 			case INITYPE_UINT8:
-				SPRINTF(work, str_u, *((BYTE *)p->value));
+				SPRINTF(work, str_u, *((UINT8 *)p->value));
 				break;
 
 			case INITYPE_UINT16:
@@ -254,7 +254,7 @@ const INITBL	*pterm;
 				break;
 
 			case INITYPE_HEX8:
-				SPRINTF(work, str_x, *((BYTE *)p->value));
+				SPRINTF(work, str_x, *((UINT8 *)p->value));
 				break;
 
 			case INITYPE_HEX16:
@@ -288,7 +288,7 @@ static const char inifile[] = "np2.cfg";
 
 static const INITBL iniitem[] = {
 	{"pc_model", INITYPE_STR,		&np2cfg.model,
-													sizeof(np2cfg.model)},
+													NELEMENTS(np2cfg.model)},
 	{"clk_base", INITYPE_SINT32,	&np2cfg.baseclock,		0},
 	{"clk_mult", INITYPE_SINT32,	&np2cfg.multiple,		0},
 
@@ -370,15 +370,15 @@ void initload(void) {
 
 	char	path[MAX_PATH];
 
-	milstr_ncpy(path, file_getcd(inifile), sizeof(path));
-	ini_read(path, ini_title, iniitem, INIITEMS);
+	file_cpyname(path, file_getcd(inifile), NELEMENTS(path));
+	ini_read(path, ini_title, iniitem, NELEMENTS(iniitem));
 }
 
 void initsave(void) {
 
 	char	path[MAX_PATH];
 
-	milstr_ncpy(path, file_getcd(inifile), sizeof(path));
-	ini_write(path, ini_title, iniitem, INIITEMS);
+	file_cpyname(path, file_getcd(inifile), NELEMENTS(path));
+	ini_write(path, ini_title, iniitem, NELEMENTS(iniitem));
 }