Commit: 50b2e09d722b08e7afe48c362605b0d1e89d6780 - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revision: 50b2e09d722b08e7afe48c362605b0d1e89d6780 (tree)
• Zeit: 2023-05-06 22:05:00
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Fix build error on FreeBSD 13.2-RELEASE.

Ändern Zusammenfassung

• modified: src/conffile.c
• modified: src/conffile.h
• modified: src/guest.c
• modified: src/guestconfig.c
• modified: src/hvcmd.c
• modified: src/keyval.c
• modified: src/tuicmd.h
• modified: src/tuiguest.c
• modified: src/tuihelp.c
• modified: src/tuihvisor.c
• modified: src/vmbhyve.c
• modified: src/vmtui_main.c

Diff

--- a/src/conffile.c
+++ b/src/conffile.c
@@ -58,8 +58,7 @@ int
 
 
 /* ===========================================================================*/
-VMTUI_CONFFILE_EXTERN
-int
+void
 	ConfFile_RegistValue(
 		KeyVal_Info	*pt_info,
 		char		*pstr_key,
@@ -127,7 +126,7 @@ int
 					errno, 0, 0x00, str_temp );
 	}
 
-	return 0x00;
+	return;
 }
 
 /* ===========================================================================*/
@@ -143,7 +142,6 @@ int
 		int			i_max_idcounter )
 {
 	int					i_cnt;
-	int					i_err;
 	int					i_ret;
 	int					i_keylen;
 	int					i_vallen;
@@ -232,7 +230,7 @@ int
 								pt_base->pstr_keyval_base_key,
 								i_keyid, pt_sub->pstr_keyval_sub_key );
 
-					i_err	= ConfFile_RegistValue(
+					ConfFile_RegistValue(
 									pt_info, str_key, pstr_value, i_vallen,
 									pt_sub->b_type, pt_sub->dw_keyval_priority,
 									pt_sub->pf_valcheck );
@@ -258,7 +256,7 @@ int
 		while( CONFFILE_TYPE_TERMINATER != pt_normal->b_type )	{
 
 			if( 0x00 == strncmp( pstr_key, pt_normal->pstr_cfg_key, i_keylen ) )	{
-				i_err	= ConfFile_RegistValue(
+				ConfFile_RegistValue(
 								pt_info, pt_normal->pstr_keyval_key,
 								pstr_value, i_vallen, pt_normal->b_type,
 								pt_normal->dw_keyval_priority, pt_normal->pf_valcheck );

--- a/src/conffile.h
+++ b/src/conffile.h
@@ -84,13 +84,16 @@ typedef struct	{
 #endif
 VMTUI_CONFFILE_EXTERN int ConfFile_ValCheck_SelectItem(
 		char *pstr_key, char *pstr_value, int i_vallen, ConfFile_SelectValue *pt_selval );
-VMTUI_CONFFILE_EXTERN int ConfFile_RegistValue(
-		KeyVal_Info *pt_info, char *pstr_key, char *pstr_value, int i_vallen,
-		Byte b_type, DWord dw_priority, ConfFile_CheckValue pf_valcheck );
 VMTUI_CONFFILE_EXTERN int ConfFile_ParseConfig(
 		KeyVal_Info *pt_info, int *pi_idcounter, char *pstr_buf, int i_buflen,
 		ConfFile_KeyTbl *pt_normal, ConfFile_BaseKeyTbl *pt_base, int i_max_idcounter );
 
+#ifdef VMTUI_SRC_CONFFILE
+void ConfFile_RegistValue(
+		KeyVal_Info *pt_info, char *pstr_key, char *pstr_value, int i_vallen,
+		Byte b_type, DWord dw_priority, ConfFile_CheckValue pf_valcheck );
+#endif
+
 #endif
 
 /* EOF of @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/

--- a/src/guest.c
+++ b/src/guest.c
@@ -364,7 +364,6 @@ int
 
 	int		i_cnt;
 	Guest	*p_guest;
-	Guest	*p_prev;
 
 	// Create Index ---
 	gpp_guestindex	= (Guest **)malloc( sizeof( Guest * ) * GUEST_ALLOC_UNITS );
@@ -391,7 +390,6 @@ int
 	pthread_rwlock_init( &gt_guest_rwlock, NULL );
 
 	// Clear All Guest structs. ---
-	p_prev	= NULL;
 	for( i_cnt = (gi_alloc_guest - 1); 0 <= i_cnt ; i_cnt-- )	{
 		p_guest	= GuestPtr(i_cnt);
 

--- a/src/guestconfig.c
+++ b/src/guestconfig.c
@@ -93,7 +93,9 @@ int
 	i_err	= ConfFile_ParseConfig(
 					&(p_guest->t_info), i_idcounter, pstr_buf, i_buflen,
 					lt_cfg_normaltbl, lt_cfg_basetbl, GUESTCONFIG_CNTID_MAX );
-
+	if( 0x00 != i_err )	{
+		return -0x01;
+	}
 
 	for( i_cnt = 0; i_cnt < GUESTCONFIG_CNTID_MAX; i_cnt++ )	{
 		if( -1 < i_idcounter[i_cnt] )	{

--- a/src/hvcmd.c
+++ b/src/hvcmd.c
@@ -43,7 +43,6 @@ int
 	DWord	dw_status;
 	DWord	dw_hvoption;
 	Byte	b_connection;
-	Byte	b_sshtype;
 	Byte	b_nosshpasswd	= 0x00;
 	Byte	b_nosudopasswd	= 0x00;
 
@@ -51,7 +50,6 @@ int
 	p_hvisor	= HVisor_Ref( i_hvisor );
 	dw_status		= p_hvisor->dw_status;
 	b_connection	= p_hvisor->b_connection;
-	b_sshtype		= p_hvisor->ssh.b_sshtype;
 	if(( HVISOR_OPTION_SSH_PASSWORD & p_hvisor->dw_option )
 			&& ( p_hvisor->ssh.str_password[0] == '\0' ))
 		{ b_nosshpasswd	= 0x01; }

--- a/src/keyval.c
+++ b/src/keyval.c
@@ -90,7 +90,6 @@ int
 	KeyVal_Item		*p_parent;
 	KeyVal_Item		*p_now;
 	KeyVal_Item		*p_prev		= NULL;
-	KeyVal_Item		*p_next		= NULL;
 
 	p_item		= p_kvinfo->p_items + i_item;
 	assert( NULL != p_item );
@@ -128,8 +127,6 @@ int
 		i_now	= p_now->i_next;
 	}
 
-	if( KEYVAL_NONEID != i_now )	{ p_next	= p_now; }
-
 	if( KEYVAL_NONEID != i_parent )	{
 		if( KEYVAL_NONEID == p_parent->i_child )
 			{ p_parent->i_child	= i_item; }
@@ -160,15 +157,12 @@ int
 	KeyVal_Item		*p_item;
 	KeyVal_Item		*p_prev		= NULL;
 	KeyVal_Item		*p_parent	= NULL;
-	int				i_parent;
 	int				i_now;
 
 	p_item	= p_kvinfo->p_items + i_item;
 	assert( NULL != p_item );
 	assert( KEYVAL_NONEID == p_item->i_child );
 
-	i_parent	= p_item->i_parent;
-
 	if( KEYVAL_NONEID != p_item->i_parent )	{
 		p_parent	= p_kvinfo->p_items + (p_item->i_parent);
 		assert( NULL != p_parent );

--- a/src/tuicmd.h
+++ b/src/tuicmd.h
@@ -43,8 +43,7 @@ VMTUI_TUICMD_EXTERN int TuiCmd_Term( void );
 #ifdef VMTUI_SRC_TUICMD
 WINDOW	*gp_cmd_win	= NULL;
 #else
-WINDOW	*gp_cmd_win;
-
+extern WINDOW	*gp_cmd_win;
 #endif
 
 #endif

--- a/src/tuiguest.c
+++ b/src/tuiguest.c
@@ -478,7 +478,7 @@ int
 	int		i_attr;
 	int		i_maxlines;
 	int		i_outlines;
-	int		i_endline;
+	//int		i_endline;
 	char				*pstr_temp;
 	TuiGuest_LineAttr	t_attr;
 	chtype	ch_line;
@@ -510,7 +510,7 @@ int
 			{ mvwprintw( lt_guest.p_subwin, gwl_info.i_width - 2, ((COLS - 2) / 2), "v" ); }
 	}
 
-	i_endline	= lt_guest.i_start_line + i_outlines;
+	//i_endline	= lt_guest.i_start_line + i_outlines;
 
 	snprintf( str_fmt, sizeof( str_fmt ), "%%-%ds", (COLS - 2) );
 	snprintf( str_valfmt, sizeof( str_valfmt ), "%%-%ds", (COLS - 2) - 25 );

--- a/src/tuihelp.c
+++ b/src/tuihelp.c
@@ -108,6 +108,11 @@ int
 
 		i_attr	= 0x00;
 		i_err	= TextBuf_AppendLine( &lt_help.t_textbuf, str_temp, 0, &i_attr );
+		if( 0x00 != i_err )	{
+			ErrInfo_Error( "Can't appent help line.",
+					HVISOR_ID_NONE, GUEST_ID_NONE, REQUEST_ID_NONE,
+					errno, i_err, 0x00, str_temp );
+		}
 	}
 
 	return 0x00;

--- a/src/tuihvisor.c
+++ b/src/tuihvisor.c
@@ -319,7 +319,7 @@ int
 	int					i_attr;
 	int					i_maxlines;
 	int					i_outlines;
-	int					i_endline;
+	//int					i_endline;
 	char				*pstr_temp;
 	TuiHVisor_LineAttr	t_attr;
 	char				str_fmt[32];
@@ -350,7 +350,7 @@ int
 			{ mvwprintw( lt_hvisor.p_subwin, gwl_info.i_width - 2, ((COLS - 2) / 2), "v" ); }
 	}
 
-	i_endline	= lt_hvisor.i_start_line + i_outlines;
+	//i_endline	= lt_hvisor.i_start_line + i_outlines;
 
 	snprintf( str_fmt, sizeof( str_fmt ), "%%-%ds", (COLS - 2) );
 	snprintf( str_valfmt, sizeof( str_valfmt ), "%%-%ds", (COLS - 2) - 25 );

--- a/src/vmbhyve.c
+++ b/src/vmbhyve.c
@@ -159,10 +159,13 @@ int
 
 	// Exec. Cmd ---
 	i_err   = p_hvcon->ExecCmd( p_hvcon, p_req->str_cmdline );
+	if( 0x00 != i_err )	{
+		return -0x03;
+	}
 
 	// Analyze Cmd Result ---
 	if( 0x00 != p_hvcon->i_exit )	{
-		return -0x03;
+		return -0x04;
 	}
 
 	return 0x00;
@@ -181,7 +184,6 @@ int
 	int			i_item;
 	int			i_gnow;
 	int			i_gtype;
-	int			i_vnc;
 	int			i_newflag	= 0x00;
 	int			i_gnext;
 	char		*pstr_line;
@@ -200,14 +202,17 @@ int
 
 	// Genereate CmdLine ---
 	i_len	= snprintf( p_req->str_cmdline, REQUEST_MAXLEN_CMDLINE,
-							"%s vm list --all", p_hvcon->sudo.str_cmdline );
+							"%s vm list", p_hvcon->sudo.str_cmdline );
 
 	// Exec. Cmd ---
 	i_err   = p_hvcon->ExecCmd( p_hvcon, p_req->str_cmdline );
+	if( 0x00 != i_err )	{
+		return -0x01;
+	}
 
 	// Analyze Cmd Result ---
 	if( 0x00 != p_hvcon->i_exit )	{
-		return -0x01;
+		return -0x02;
 	}
 
 	pstr_next	= p_hvcon->str_buffer;
@@ -266,7 +271,6 @@ int
 		strncpy( str_temp, pstr_item[5], sizeof( str_temp ) );
 		if( '-' != str_temp[0] )	{
 			pstr_host	= NULL;
-			i_vnc		= 0;
 			pstr_now	= str_temp;
 			pstr_host	= strsep( &pstr_now, ":" );
 

--- a/src/vmtui_main.c
+++ b/src/vmtui_main.c
@@ -115,6 +115,9 @@ int main( int argc, char *argv[] )	{
 
 	SettingFile_SetSettingFilePath( NULL, NULL );
 	i_err	= SettingFile_ReadSetting();
+	if( 0x00 != i_err )	{
+		goto	goto_main_post;
+	}
 
 	// Initial Auto-Connect HVisor ---
 	i_hvisor	= HVisor_GetTopID();
@@ -168,7 +171,7 @@ int main( int argc, char *argv[] )	{
 		i_hvisor	= i_hnext;
 	}
 
-//goto_main_post:
+goto_main_post:
 	VmTui_Term();
 
 	return 0x00;