File 0415-Clean-unused-wxe_driver-callbacks.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0415-Clean-unused-wxe_driver-callbacks.patch of Package erlang (Revision b921e8aed3aceafaa8c09c18784302db)

Currently displaying revision b921e8aed3aceafaa8c09c18784302db , Show latest

From fbde368c08e4194059e76888fe866f3ebd80f150 Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Fri, 29 Jun 2018 13:32:58 +0200
Subject: [PATCH 2/4] Clean unused wxe_driver callbacks

---
 lib/wx/c_src/wxe_driver.c | 73 ++++++++++++++++++-----------------------------
 lib/wx/c_src/wxe_driver.h |  2 --
 lib/wx/c_src/wxe_main.cpp | 10 -------
 3 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index 8b8c625971..6fdb1385e7 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -39,9 +39,7 @@
 #define TEMP_BINARY_SIZE 512
 
 static ErlDrvData wxe_driver_start(ErlDrvPort port, char *buff);
-static int  wxe_driver_load(void);
 static void wxe_driver_stop(ErlDrvData handle);
-static void wxe_driver_unload(void);
 static ErlDrvSSizeT wxe_driver_control(ErlDrvData handle,
 				       unsigned int command,  
 				       char* buf, ErlDrvSizeT count,
@@ -63,30 +61,30 @@ char * erl_wx_privdir;
 ** The driver struct
 */
 static ErlDrvEntry wxe_driver_entry = {
-   wxe_driver_load,	  /* F_PTR init,   called at loading */
-   wxe_driver_start,      /* L_PTR start,  called when port is opened */
-   wxe_driver_stop,       /* F_PTR stop,   called when port is closed  */
-   NULL,	          /* F_PTR output, called when erlang has sent */
-   NULL,                  /* F_PTR ready_input, called when input descriptor 
-			     ready */
-   NULL,                  /* F_PTR ready_output, called when output 
-			     descriptor ready */
-   "wxe_driver",          /* char *driver_name, the argument to open_port */
-   wxe_driver_unload,     /* F_PTR finish, called when unloaded */
-   NULL,                  /* void * that is not used (BC) */
-   wxe_driver_control,     /* F_PTR control, port_control callback */
-   NULL,                  /* F_PTR timeout, reserved */
-   standard_outputv,	  /* F_PTR outputv, reserved */
-   NULL,                  /* async */ 
-   NULL,                  /* flush */
-   wxe_driver_call,       /* call */
-   NULL,                  /* Event */
+   NULL,                           /* F_PTR init, called at loading */
+   wxe_driver_start,               /* L_PTR start, called when port is opened */
+   wxe_driver_stop,                /* F_PTR stop, called when port is closed  */
+   NULL,                           /* F_PTR output, called when erlang has sent */
+   NULL,                           /* F_PTR ready_input, called when 
+                                      input descriptor ready */
+   NULL,                           /* F_PTR ready_output, called when 
+                                      output descriptor ready */
+   "wxe_driver",                   /* char *driver_name, the argument to open_port */
+   NULL,                           /* F_PTR finish, called when unloaded */
+   NULL,                           /* void * that is not used (BC) */
+   wxe_driver_control,             /* F_PTR control, port_control callback */
+   NULL,                           /* F_PTR timeout, reserved */
+   standard_outputv,               /* F_PTR outputv, reserved */
+   NULL,                           /* async */
+   NULL,                           /* flush */
+   wxe_driver_call,                /* call */
+   NULL,                           /* Event */
    ERL_DRV_EXTENDED_MARKER,
    ERL_DRV_EXTENDED_MAJOR_VERSION,
    ERL_DRV_EXTENDED_MINOR_VERSION,
-   ERL_DRV_FLAG_USE_PORT_LOCKING, /* Port lock */ 
-   NULL,                  /* Reserved Handle */
-   wxe_process_died,      /* Process Exited */
+   ERL_DRV_FLAG_USE_PORT_LOCKING,  /* Port lock */
+   NULL,                           /* Reserved Handle */
+   wxe_process_died,               /* Process Exited */
 };
 
 DRIVER_INIT(wxe_driver)
@@ -94,28 +92,20 @@ DRIVER_INIT(wxe_driver)
    return &wxe_driver_entry;
 }
 
-int wxe_driver_load() 
-{
-   if(load_native_gui())
-      return 0;
-   else 
-      return -1;
-}
-
 ErlDrvPort WXE_DRV_PORT_HANDLE = 0;
 ErlDrvTermData WXE_DRV_PORT = 0;
 
 static ErlDrvData 
 wxe_driver_start(ErlDrvPort port, char *buff)
-{      
+{
    wxe_data *data;
 
    data = (wxe_data *) malloc(sizeof(wxe_data));
    wxe_debug = 0;
-  
+
    if (data == NULL) {
       fprintf(stderr, " Couldn't alloc mem\r\n");
-      return(ERL_DRV_ERROR_GENERAL);  /* ENOMEM */      
+      return(ERL_DRV_ERROR_GENERAL);  /* ENOMEM */
    } else {
       ErlDrvTermData term_port = driver_mk_port(port);
       set_port_control_flags(port, PORT_CONTROL_FLAG_BINARY);
@@ -129,8 +119,8 @@ wxe_driver_start(ErlDrvPort port, char *buff)
       data->port = term_port;
       data->pdl = driver_pdl_create(port);
       if(WXE_DRV_PORT_HANDLE == 0) {
-	 for(; *buff != 32; buff++); 
-	 buff++; 
+	 for(; *buff != 32; buff++);
+	 buff++;
 	 erl_wx_privdir = strdup(buff);
 	 
 	 WXE_DRV_PORT_HANDLE = port;
@@ -141,13 +131,13 @@ wxe_driver_start(ErlDrvPort port, char *buff)
       } else {
 	  meta_command(CREATE_PORT,data);
       }
-      return (ErlDrvData) data;	 
+      return (ErlDrvData) data;
    }
 }
 
 static void
 wxe_driver_stop(ErlDrvData handle) 
-{  
+{
    wxe_data *sd = ((wxe_data *)handle);
    if(sd->port_handle != WXE_DRV_PORT_HANDLE) {
       // fprintf(stderr, "%s:%d: STOP \r\n", __FILE__,__LINE__);
@@ -155,18 +145,11 @@ wxe_driver_stop(ErlDrvData handle)
    } else {
        // fprintf(stderr, "%s:%d: STOP \r\n", __FILE__,__LINE__);
        stop_native_gui(wxe_master);
-       unload_native_gui();
        free(wxe_master);
        wxe_master = NULL;
    }
 }
 
-static void
-wxe_driver_unload(void) 
-{
-   // fprintf(stderr, "%s:%d: UNLOAD \r\n", __FILE__,__LINE__);
-}
-
 static ErlDrvSSizeT
 wxe_driver_control(ErlDrvData handle, unsigned op,
 		   char* buf, ErlDrvSizeT count,
diff --git a/lib/wx/c_src/wxe_driver.h b/lib/wx/c_src/wxe_driver.h
index f9bca049c8..8b4ce2b804 100644
--- a/lib/wx/c_src/wxe_driver.h
+++ b/lib/wx/c_src/wxe_driver.h
@@ -56,10 +56,8 @@ typedef struct wxe_data_def {
 
 void init_glexts(wxe_data*);
 
-int  load_native_gui();
 int  start_native_gui(wxe_data *sd);
 void stop_native_gui(wxe_data *sd);
-void unload_native_gui();
 
 #define FUNC_CALL    13
 #define CREATE_PORT  14
diff --git a/lib/wx/c_src/wxe_main.cpp b/lib/wx/c_src/wxe_main.cpp
index e2cd30a8e0..5b65d8a59b 100644
--- a/lib/wx/c_src/wxe_main.cpp
+++ b/lib/wx/c_src/wxe_main.cpp
@@ -59,11 +59,6 @@ void *wxe_main_loop(void * );
  *  START AND STOP of driver thread
  * ************************************************************/
 
-int load_native_gui()
-{
-  return 1;
-}
-
 int start_native_gui(wxe_data *sd)
 {
   int res;
@@ -115,11 +110,6 @@ void stop_native_gui(wxe_data *sd)
   erl_drv_cond_destroy(wxe_batch_locker_c);
 }
 
-void unload_native_gui()
-{
-
-}
-
 /* ************************************************************
  *  wxWidgets Thread
  * ************************************************************/
-- 
2.16.4

Places

File 0415-Clean-unused-wxe_driver-callbacks.patch of Package erlang (Revision b921e8aed3aceafaa8c09c18784302db)

Places