merge userint1.c and userint2.c intu ui.c, rename userint0.c to displ…

…ay.c
FDOS · Feb 7, 2024 · 53359b7 · 53359b7
1 parent ab00c0c
commit 53359b7
Show file tree

Hide file tree

Showing 12 changed files with 759 additions and 797 deletions.
diff --git a/source/fdisk/Makefile b/source/fdisk/Makefile
@@ -61,12 +61,12 @@ CFLAGS += -DRELEASE=$(RELEASE)
 !endif
 
 objs  = main.obj cmd.obj fdiskio.obj pdiskio.obj pcompute.obj compat.obj
-objs += helpscr.obj userint0.obj
+objs += helpscr.obj display.obj
 objs +=
 !ifdef LITE
 CFLAGS += -DFDISKLITE=1
 !else
-objs += userint1.obj userint2.obj kbdinput.obj 
+objs += ui.obj kbdinput.obj 
 !endif
 objs += ansicon.obj printf.obj bootnorm.obj
 objs += svarlang.obj auto_exe.obj auto_nls.obj deflang.obj

diff --git a/source/fdisk/cmd.c b/source/fdisk/cmd.c
@@ -6,17 +6,16 @@
 #include "ansicon.h"
 #include "cmd.h"
 #include "compat.h"
+#include "display.h"
 #include "fdiskio.h"
 #include "main.h"
 #include "pcompute.h"
 #include "pdiskio.h"
 #include "printf.h"
 #include "svarlang/svarlang.h"
-#include "userint0.h"
 
 #ifndef FDISKLITE
-#include "userint1.h"
-#include "userint2.h"
+#include "ui.h"
 #endif
 
 /* /CLEARFLAG command line option */

diff --git a/source/fdisk/userint0.c → source/fdisk/display.c b/source/fdisk/userint0.c → source/fdisk/display.c
@@ -3,16 +3,14 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ansicon.h"
 #include "compat.h"
+#include "display.h"
 #include "main.h"
 #include "pcompute.h"
-
-#include "ansicon.h"
 #include "printf.h"
 #include "svarlang/svarlang.h"
 
-#include "userint0.h"
-
 /* Pause Routine */
 void Pause( void )
 {

diff --git a/source/fdisk/userint0.h → source/fdisk/display.h b/source/fdisk/userint0.h → source/fdisk/display.h
@@ -1,7 +1,7 @@
 /* contains UI calls that required by command-line operations */
 
-#ifndef USERINT3_H
-#define USERINT3_H
+#ifndef DISPLAY_H
+#define DISPLAY_H
 
 void Display_Information( void );
 void Dump_Partition_Information( void );

diff --git a/source/fdisk/helpscr.c b/source/fdisk/helpscr.c
@@ -16,14 +16,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "main.h"
-#include "pdiskio.h"
-#include "userint0.h"
-
 #include "ansicon.h"
+#include "display.h"
 #include "helpscr.h"
+#include "main.h"
+#include "pdiskio.h"
 #include "printf.h"
-
 #include "svarlang/svarlang.h"
 
 /*

diff --git a/source/fdisk/kbdinput.c b/source/fdisk/kbdinput.c
@@ -10,18 +10,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ansicon.h"
 #include "compat.h"
+#include "display.h"
+#include "kbdinput.h"
 #include "main.h"
 #include "pdiskio.h"
-#include "userint0.h"
-#include "userint1.h"
-
-#include "kbdinput.h"
-
-#include "ansicon.h"
 #include "printf.h"
-
 #include "svarlang/svarlang.h"
+#include "ui.h"
 
 /* Get input from keyboard */
 unsigned long Input( int size_of_field, int x_position, int y_position,

diff --git a/source/fdisk/main.c b/source/fdisk/main.c
@@ -15,16 +15,15 @@
 
 #include "cmd.h"
 #include "compat.h"
+#include "display.h"
 #include "fdiskio.h"
 #include "helpscr.h"
 #include "main.h"
 #include "pcompute.h"
 #include "pdiskio.h"
-#include "userint0.h"
 
 #ifndef FDISKLITE
-#include "userint1.h"
-#include "userint2.h"
+#include "ui.h"
 #endif
 #include "ansicon.h"
 #include "printf.h"