Get rid of the non-reloadable version

It creates two different versions of the code for no valid
reason. dynamically loading the display is not that mystical in the end.

1 files changed, 0 insertions, 27 deletions

diff --git a/src/disp.c b/src/disp.c
index fa1559c..c4c1cd6 100644
--- a/src/disp.c
+++ b/src/disp.c
@@ -7,13 +7,6 @@
 
 #include "disp.h"
 
-#ifdef NDEBUG
-extern struct disp *cli_disp;
-extern struct disp *tui_disp;
-extern struct disp *ray_disp;
-#endif
-
-#ifndef NDEBUG
 static void *
 load_generic_symbol(struct disp *disp, char *base_name)
 {
@@ -35,9 +28,7 @@ load_generic_symbol(struct disp *disp, char *base_name)
 
 	return ptr;
 }
-#endif
 
-#ifndef NDEBUG
 static void
 load_symbols(struct disp *disp)
 {
@@ -62,12 +53,10 @@ load_symbols(struct disp *disp)
 	printf("INFO: successfully loaded symbols from \"%s\"\n",
 	       disp->so_path);
 }
-#endif
 
 struct disp *
 get_disp(char *disp_name)
 {
-#ifndef NDEBUG
 	/* displays are shared libraries */
 	char so_path[128];
 	strcpy(so_path, CALCULER_PREFIX);
@@ -81,16 +70,6 @@ get_disp(char *disp_name)
 	load_symbols(disp);
 
 	return disp;
-#else
-	if (strcmp(disp_name, "cli") == 0)
-		return cli_disp;
-	if (strcmp(disp_name, "tui") == 0)
-		return tui_disp;
-	if (strcmp(disp_name, "ray") == 0)
-		return ray_disp;
-
-	return NULL;
-#endif
 }
 
 void
@@ -98,17 +77,12 @@ destroy_disp(struct disp *disp)
 {
 	if (disp->destroy)
 		disp->destroy();
-
-#ifndef NDEBUG
 	if (disp->dl_handle)
 		dlclose(disp->dl_handle);
-
 	free(disp->so_path);
 	free(disp);
-#endif
 }
 
-#ifndef NDEBUG
 void
 disp_reload(struct disp *disp)
 {
@@ -126,4 +100,3 @@ disp_reload(struct disp *disp)
 
 	printf("INFO: reloading done\n");
 }
-#endif