PDC_free_memory_allocations( ) wasn't totally stupid, but it shouldn'…

…t be needed. The specifications say that delscreen( ) 'frees storage associated with the SCREEN data structure', i.e., it really ought to do everything that PDC_free_memory_allocations( ) is doing; there's no need for a PDCursesMod extension.

curses.h

@@ -1765,7 +1765,6 @@ PDCEX  void    PDC_set_resize_limits( const int new_min_lines,
                                const int new_max_lines,
                                const int new_min_cols,
                                const int new_max_cols);
-PDCEX  void    PDC_free_memory_allocations( void);
 
 #define FUNCTION_KEY_SHUT_DOWN        0
 #define FUNCTION_KEY_PASTE            1

demos/init_col.c

@@ -154,7 +154,7 @@ int main( const int argc, const char *argv[])
 
     endwin( );
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
     return( -1);
 }

demos/mbrot.c

@@ -335,7 +335,7 @@ int main( const int argc, const char **argv)
 
     endwin( );
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
     return( 0);
 }

demos/newtest.c

@@ -589,7 +589,7 @@ int main( int argc, char **argv)
 
     endwin();
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
 
     return 0;

demos/ozdemo.c

@@ -440,7 +440,7 @@ int main(int argc, char **argv)
     delwin(win);
     endwin();
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
 
     return 0;

demos/picsview.c

@@ -490,7 +490,7 @@ int main( const int argc, const char *argv[])
    free( pixels);
    endwin();
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+   delscreen( SP);                       /* says all memory was freed */
 #endif
    return( 0);
 }

demos/test_pan.c

@@ -201,7 +201,7 @@ int main()
       delwin( my_wins[i]);
       }
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
     return( 0);
 }

demos/testcurs.c

@@ -109,9 +109,7 @@ COMMAND command[MAX_OPTIONS] =
 
 int width, height;
 static bool report_mouse_movement = FALSE;
-#ifndef XCURSES
 static SCREEN *screen_pointer;
-#endif
 
 int main(int argc, char *argv[])
 {
@@ -249,12 +247,8 @@ int main(int argc, char *argv[])
 
     delwin(win);
     endwin();
-#ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
-#else
-    delscreen( screen_pointer);
-#endif
-
+                            /* Not really needed,  but ensures Valgrind  */
+    delscreen( screen_pointer);          /* says all memory was freed */
     return 0;
 }
 
@@ -280,6 +274,7 @@ int initTest(WINDOW **win, int argc, char *argv[])
 {
 #ifdef XCURSES
     Xinitscr(argc, argv);
+    screen_pointer = SP;
 #else
     INTENTIONALLY_UNUSED_PARAMETER( argv);
     INTENTIONALLY_UNUSED_PARAMETER( argc);

demos/widetest.c

@@ -119,7 +119,7 @@ int main( const int argc, const char *argv[])
         resize_term( 0, 0);
     endwin( );
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
     return( -1);
 }

demos/worm.c

@@ -148,7 +148,7 @@ static void cleanup(void)
     curs_set(1);
     endwin();
 #ifdef __PDCURSESMOD__      /* Not really needed,  but ensures Valgrind  */
-    PDC_free_memory_allocations( );      /* says all memory was freed */
+    delscreen( SP);                      /* says all memory was freed */
 #endif
 }
 

docs/MANUAL.md

@@ -1356,7 +1356,6 @@ initscr
     SCREEN *newterm(const char *type, FILE *outfd, FILE *infd);
     SCREEN *set_term(SCREEN *new);
     void delscreen(SCREEN *sp);
-    void PDC_free_memory_allocations( void);
 
     int resize_term(int nlines, int ncols);
     bool is_termresized(void);
@@ -1390,15 +1389,6 @@ initscr
    needed. In PDCurses, the parameter must be the value of SP, and
    delscreen() sets SP to NULL.
 
-   PDC_free_memory_allocations() frees all memory allocated by PDCurses,
-   including SP and any platform-dependent memory.  It should be called
-   after endwin(),  not instead of it.  It need not be called,  because
-   remaining memory will be freed at exit;  but it can help in diagnosing
-   memory leak issues by ruling out any from PDCurses.
-
-   Note that SDLn and X11 have known memory leaks within their libraries,
-   which appear to be effectively unfixable.
-
    set_term() does nothing meaningful in PDCurses, but is included for
    compatibility with other curses implementations.
 
@@ -2948,9 +2938,8 @@ window
    ncols to COLS - begx. Create a new full-screen window by calling
    newwin(0, 0, 0, 0).
 
-   delwin() deletes the named window, freeing all associated memory. In
-   the case of overlapping windows, subwindows should be deleted before
-   the main window.
+   delwin() deletes the named window, freeing all associated memory.
+   Subwindows must be deleted before the main window can be deleted.
 
    mvwin() moves the window so that the upper left-hand corner is at
    position (y,x). If the move would cause the window to be off the

pdcurses/initscr.c

@@ -18,7 +18,6 @@ initscr
     SCREEN *newterm(const char *type, FILE *outfd, FILE *infd);
     SCREEN *set_term(SCREEN *new);
     void delscreen(SCREEN *sp);
-    void PDC_free_memory_allocations( void);
 
     int resize_term(int nlines, int ncols);
     bool is_termresized(void);
@@ -52,15 +51,6 @@ initscr
    needed. In PDCurses, the parameter must be the value of SP, and
    delscreen() sets SP to NULL.
 
-   PDC_free_memory_allocations() frees all memory allocated by PDCurses,
-   including SP and any platform-dependent memory.  It should be called
-   after endwin(),  not instead of it.  It need not be called,  because
-   remaining memory will be freed at exit;  but it can help in diagnosing
-   memory leak issues by ruling out any from PDCurses.
-
-   Note that SDLn and X11 have known memory leaks within their libraries,
-   which appear to be effectively unfixable.
-
    set_term() does nothing meaningful in PDCurses, but is included for
    compatibility with other curses implementations.
 
@@ -334,13 +324,6 @@ bool isendwin(void)
     return SP ? !(SP->alive) : FALSE;
 }
 
-void PDC_free_memory_allocations( void)
-{
-   PDC_clearclipboard( );
-   traceoff( );
-   delscreen( SP);
-}
-
 SCREEN *newterm(const char *type, FILE *outfd, FILE *infd)
 {
     PDC_LOG(("newterm() - called\n"));
@@ -370,6 +353,7 @@ void delscreen(SCREEN *sp)
     if (!SP || sp != SP)
         return;
 
+    traceoff( );
     free(SP->c_ungch);
     free(SP->c_buffer);