[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-gv] [PATCH] remove ancient memory debugging stuff
|
From: |
Bernhard R. Link |
|
Subject: |
[bug-gv] [PATCH] remove ancient memory debugging stuff |
|
Date: |
Sun, 13 Feb 2011 20:19:30 +0100 |
|
User-agent: |
Mutt/1.5.18 (2008-05-17) |
Thanks to valgrind in-process memory debugging is no longer needed.
Thus remove the memory debugging macros, making the code more readable.
Additionally if (p) GV_XtFree(p) is replaced with XtFree(p) as XtFree
is garanteed to ignore NULL pointers. (so it free, but only on 'modern'
systems).
---
gv/src/Aaa_intern.h | 11 +-
gv/src/FileSel.c | 94 +++++++-------
gv/src/Ghostview.c | 23 ++--
gv/src/Makefile.am | 12 --
gv/src/Vlist.c | 10 +-
gv/src/actions.c | 9 +-
gv/src/callbacks.c | 130 +++++++++----------
gv/src/d_aaa_xtmem.h | 55 --------
gv/src/d_fs_xtmem.h | 55 --------
gv/src/d_gv_mem.h | 51 --------
gv/src/d_gv_xtmem.h | 55 --------
gv/src/d_mem.c | 327 ------------------------------------------------
gv/src/d_mem.h | 91 -------------
gv/src/d_memdebug.h | 80 ------------
gv/src/d_proc_xtmem.h | 55 --------
gv/src/d_ps_mem.h | 57 ---------
gv/src/d_ps_xtmem.h | 55 --------
gv/src/d_xtmem.c | 299 -------------------------------------------
gv/src/d_xtmem.h | 81 ------------
gv/src/error.c | 3 +-
gv/src/file.c | 9 +-
gv/src/gv_signal.c | 5 +-
gv/src/gv_string.c | 3 +-
gv/src/magmenu.c | 21 ++--
gv/src/main.c | 29 ++---
gv/src/media.c | 19 ++--
gv/src/misc.c | 49 ++++----
gv/src/miscmenu.c | 11 +-
gv/src/options.c | 27 ++--
gv/src/options_fs.c | 9 +-
gv/src/options_gs.c | 11 +-
gv/src/options_gv.c | 35 +++---
gv/src/options_setup.c | 31 +++---
gv/src/process.c | 17 ++--
gv/src/ps.c | 119 +++++++++---------
gv/src/resource.c | 35 +++---
gv/src/save.c | 45 ++++----
gv/src/scale.c | 19 ++--
gv/src/vms_dir.c | 33 +++---
gv/src/widgets_misc.c | 1 -
40 files changed, 388 insertions(+), 1693 deletions(-)
delete mode 100644 gv/src/d_aaa_xtmem.h
delete mode 100644 gv/src/d_fs_xtmem.h
delete mode 100644 gv/src/d_gv_mem.h
delete mode 100644 gv/src/d_gv_xtmem.h
delete mode 100644 gv/src/d_mem.c
delete mode 100644 gv/src/d_mem.h
delete mode 100644 gv/src/d_memdebug.h
delete mode 100644 gv/src/d_proc_xtmem.h
delete mode 100644 gv/src/d_ps_mem.h
delete mode 100644 gv/src/d_ps_xtmem.h
delete mode 100644 gv/src/d_xtmem.c
delete mode 100644 gv/src/d_xtmem.h
diff --git a/gv/src/Aaa_intern.h b/gv/src/Aaa_intern.h
index 99c3489..dd11120 100644
--- a/gv/src/Aaa_intern.h
+++ b/gv/src/Aaa_intern.h
@@ -62,7 +62,6 @@
#endif
#include "message.h"
-#include "d_memdebug.h"
#ifdef MEMDEBUG
# define MEMMESSAGE(sss) INFMESSAGE(sss)
@@ -142,13 +141,13 @@ extern int layout_lex (
/* Macros */
/*---------------------------------------------------------*/
-#define New(ttt) (ttt *) AAA_XtMalloc(sizeof(ttt))
-#define Dispose(xxx) AAA_XtFree(xxx)
-#define Some(ttt,nnn) (ttt *) AAA_XtMalloc(sizeof(ttt)*nnn)
+#define New(ttt) (ttt *) XtMalloc(sizeof(ttt))
+#define Dispose(xxx) XtFree((XtPointer)xxx)
+#define Some(ttt,nnn) (ttt *) XtMalloc(sizeof(ttt)*nnn)
#define More(xxx,ttt,nnn) ( \
(xxx) ? \
- (ttt *) AAA_XtRealloc(xxx,sizeof(ttt)*nnn) : \
- (ttt *) AAA_XtMalloc(sizeof(ttt)*nnn) \
+ (ttt *) XtRealloc(xxx,sizeof(ttt)*nnn) : \
+ (ttt *) XtMalloc(sizeof(ttt)*nnn) \
)
#define GlueEqual(a,b) \
diff --git a/gv/src/FileSel.c b/gv/src/FileSel.c
index 2e7c8f8..342289b 100644
--- a/gv/src/FileSel.c
+++ b/gv/src/FileSel.c
@@ -71,8 +71,6 @@
#include "Vlist.h"
#include "VlistP.h"
-#include "d_memdebug.h"
-
/*####################################################################
OS dependant Definitions
####################################################################*/
@@ -302,10 +300,10 @@ Meta<Key>Z: no-op()\n\
#define REALLOC_MORE_IF_NEEDED(list,needed,current)
\
if (needed >= current) {
\
current *= 2;
\
- list = (String *) FS_XtRealloc((char *)
list,(unsigned)(current*sizeof(String)));\
+ list = (String *) XtRealloc((char *)
list,(unsigned)(current*sizeof(String)));\
}
#define ALLOC_LIST(list,needed)
\
- list = (String *) FS_XtMalloc((unsigned)(needed* sizeof(String)))
+ list = (String *) XtMalloc((unsigned)(needed* sizeof(String)))
#define POSITION(pos) ((pos==1)+2*(pos==2)+4*(pos==3)+8*(pos==4))
#define IS_BUTTON(pos) (POSITION(pos) & BUTTONS)
@@ -463,17 +461,17 @@ static void Initialize(request, new, argl, num_argl)
{
char app_dir[FS_MAXNAMLEN];
getwd(app_dir);
- APP_DIR = FS_XtNewString(app_dir);
+ APP_DIR = XtNewString(app_dir);
}
FS_RESCANBUTTON = ADD_Widget("rescan",buttonWidgetClass,new);
ADD_Callback(FS_RESCANBUTTON,rescanProc);
- FILTERS=FS_XtNewString(FILTERS);
+ FILTERS=XtNewString(FILTERS);
FS_FILTERSBUTTON = ADD_Widget("filters",mbuttonWidgetClass,new);
FS_FILTERSMENU = BuildMenu(FS_FILTERSBUTTON,FILTERS,"None",filtersProc);
- DIRS=FS_XtNewString(DIRS);
+ DIRS=XtNewString(DIRS);
FS_DIRSBUTTON = ADD_Widget("dirs",mbuttonWidgetClass,new);
FS_DIRSMENU = BuildMenu(FS_DIRSBUTTON,DIRS,"Home\nTmp",dirsProc);
@@ -545,11 +543,11 @@ static void Initialize(request, new, argl, num_argl)
FS_OLD_TEXTFIELD = (Widget)NULL;
- CURRENT_PATH = FS_XtMalloc(FS_MAXNAMLEN*sizeof(char));
- CURRENT_DIR = FS_XtMalloc(FS_MAXNAMLEN*sizeof(char));
- CURRENT_FILE = FS_XtMalloc(FS_MAXNAMLEN*sizeof(char));
- PATH = FS_XtNewString("");
- FILTER = FS_XtNewString("");
+ CURRENT_PATH = XtMalloc(FS_MAXNAMLEN*sizeof(char));
+ CURRENT_DIR = XtMalloc(FS_MAXNAMLEN*sizeof(char));
+ CURRENT_FILE = XtMalloc(FS_MAXNAMLEN*sizeof(char));
+ PATH = XtNewString("");
+ FILTER = XtNewString("");
MULTICLICK = DISABLED;
XtCallActionProc(FS_PATH,"FS_textfieldFocusAction",(XEvent *)NULL,(String
*)NULL,(Cardinal)0);
@@ -638,21 +636,21 @@ Destroy(w)
FS_WIDGET w;
BEGINMESSAGE(Destroy)
- while ((--TOPDIR_ENTRIES) >=0 ) FS_XtFree(TOPDIR_ENTRY(TOPDIR_ENTRIES));
++TOPDIR_ENTRIES;
- while ((--CURDIR_ENTRIES) >=0 ) FS_XtFree(CURDIR_ENTRY(CURDIR_ENTRIES));
++CURDIR_ENTRIES;
- while ((--SUBDIR_ENTRIES) >=0 ) FS_XtFree(SUBDIR_ENTRY(SUBDIR_ENTRIES));
++SUBDIR_ENTRIES;
-
- FS_XtFree(TOPDIR_LIST);
- FS_XtFree(CURDIR_LIST);
- FS_XtFree(SUBDIR_LIST);
- FS_XtFree(PATH);
- FS_XtFree(FILTER);
- FS_XtFree(CURRENT_PATH);
- FS_XtFree(CURRENT_DIR);
- FS_XtFree(CURRENT_FILE);
- FS_XtFree(APP_DIR);
- FS_XtFree(FILTERS);
- FS_XtFree(DIRS);
+ while ((--TOPDIR_ENTRIES) >=0 ) XtFree(TOPDIR_ENTRY(TOPDIR_ENTRIES));
++TOPDIR_ENTRIES;
+ while ((--CURDIR_ENTRIES) >=0 ) XtFree(CURDIR_ENTRY(CURDIR_ENTRIES));
++CURDIR_ENTRIES;
+ while ((--SUBDIR_ENTRIES) >=0 ) XtFree(SUBDIR_ENTRY(SUBDIR_ENTRIES));
++SUBDIR_ENTRIES;
+
+ XtFree((XtPointer)TOPDIR_LIST);
+ XtFree((XtPointer)CURDIR_LIST);
+ XtFree((XtPointer)SUBDIR_LIST);
+ XtFree(PATH);
+ XtFree(FILTER);
+ XtFree(CURRENT_PATH);
+ XtFree(CURRENT_DIR);
+ XtFree(CURRENT_FILE);
+ XtFree(APP_DIR);
+ XtFree(FILTERS);
+ XtFree(DIRS);
DESTROY_MULTICLICK;
ENDMESSAGE(Destroy)
@@ -739,7 +737,7 @@ strreplace(out,find,replace,in)
findlength = strlen(find);
if (!(*in) || !(*find)) return;
- intemp = FS_XtMalloc(strlen(in)+1);
+ intemp = XtMalloc(strlen(in)+1);
strcpy(intemp,in);
temp=intemp;
@@ -751,7 +749,7 @@ strreplace(out,find,replace,in)
temp = strchr(temp,'\0') + findlength;
}
strcat(out,temp);
- FS_XtFree(intemp);
+ XtFree(intemp);
}
/*----------------------------------------------------------------------
@@ -1300,8 +1298,8 @@ static void changeList(w,list,entries)
}
l++;
e++;
- s = FS_XtMalloc(l*sizeof(char));
- d = FS_XtMalloc(e*sizeof(char));
+ s = XtMalloc(l*sizeof(char));
+ d = XtMalloc(e*sizeof(char));
s[0]='\0';
i=0;
p = s;
@@ -1321,8 +1319,8 @@ static void changeList(w,list,entries)
SET_Arg(XtNlabel, s);
SET_Arg(XtNvlist, d);
SET_Values(w);
- FS_XtFree(s);
- FS_XtFree(d);
+ XtFree(s);
+ XtFree(d);
ENDMESSAGE(changeList)
}
@@ -1468,7 +1466,7 @@ static void SetDirectoryView(fs,dir)
CombineToPath(path,CURRENT_DIR,CURRENT_FILE);
savestrcpy(CURRENT_PATH,path);
SMESSAGE(CURRENT_PATH)
- while ((--CURDIR_ENTRIES) >=0 ) FS_XtFree(CURDIR_ENTRY(CURDIR_ENTRIES));
++CURDIR_ENTRIES;
+ while ((--CURDIR_ENTRIES) >=0 ) XtFree(CURDIR_ENTRY(CURDIR_ENTRIES));
++CURDIR_ENTRIES;
CURDIR_ENTRY(CURDIR_ENTRIES) = (String) NULL;
if (error) error = 1;
@@ -1483,16 +1481,16 @@ static void SetDirectoryView(fs,dir)
return;
}
- while ((--TOPDIR_ENTRIES) >=0 ) FS_XtFree(TOPDIR_ENTRY(TOPDIR_ENTRIES));
++TOPDIR_ENTRIES;
+ while ((--TOPDIR_ENTRIES) >=0 ) XtFree(TOPDIR_ENTRY(TOPDIR_ENTRIES));
++TOPDIR_ENTRIES;
TOPDIR_ENTRY(TOPDIR_ENTRIES) = (String) NULL;
- while ((--SUBDIR_ENTRIES) >=0 ) FS_XtFree(SUBDIR_ENTRY(SUBDIR_ENTRIES));
++SUBDIR_ENTRIES;
+ while ((--SUBDIR_ENTRIES) >=0 ) XtFree(SUBDIR_ENTRY(SUBDIR_ENTRIES));
++SUBDIR_ENTRIES;
SUBDIR_ENTRY(SUBDIR_ENTRIES) = (String) NULL;
setText(FS_PATH,CURRENT_PATH);
GET_Value(FS_FILTER,XtNstring,&filter);
{
char *tmp,*f;
f = filter;
- malloced_filter = tmp = (char*)
FS_XtMalloc((strlen(filter)+10)*sizeof(char));
+ malloced_filter = tmp = (char*)
XtMalloc((strlen(filter)+10)*sizeof(char));
if (*f=='n') *tmp++=' ';
while (*f) {
if (isspace(*f)) {
@@ -1519,14 +1517,14 @@ static void SetDirectoryView(fs,dir)
if (strcmp(str,".")) {
if (!stat(str,&sbuf) && S_ISDIR(sbuf.st_mode) && (strncmp(str,
".", 1) || !strcmp(str, ".."))) {
REALLOC_MORE_IF_NEEDED(SUBDIR_LIST,SUBDIR_ENTRIES+1,SUBDIR_ALLOC);
- SUBDIR_ENTRY(SUBDIR_ENTRIES) = FS_XtNewString(str);
+ SUBDIR_ENTRY(SUBDIR_ENTRIES) = XtNewString(str);
SMESSAGE(SUBDIR_ENTRY(SUBDIR_ENTRIES))
SUBDIR_ENTRIES++;
} else {
if (viewmode==XawFileSelectionFilter)
accepted=strwild(str,filter);
if (accepted) {
REALLOC_MORE_IF_NEEDED(CURDIR_LIST,CURDIR_ENTRIES+1,CURDIR_ALLOC);
- CURDIR_ENTRY(CURDIR_ENTRIES) = FS_XtNewString(str);
+ CURDIR_ENTRY(CURDIR_ENTRIES) = XtNewString(str);
SMESSAGE(CURDIR_ENTRY(CURDIR_ENTRIES))
CURDIR_ENTRIES++;
}
@@ -1560,7 +1558,7 @@ static void SetDirectoryView(fs,dir)
char *p=path;
savestrcpy(path,CURRENT_DIR);
REALLOC_MORE_IF_NEEDED(TOPDIR_LIST,TOPDIR_ENTRIES+1,TOPDIR_ALLOC);
- TOPDIR_ENTRY(TOPDIR_ENTRIES) = FS_XtNewString("/");
+ TOPDIR_ENTRY(TOPDIR_ENTRIES) = XtNewString("/");
SMESSAGE(TOPDIR_ENTRY(TOPDIR_ENTRIES))
TOPDIR_ENTRIES++;
SMESSAGE(p)
@@ -1571,7 +1569,7 @@ static void SetDirectoryView(fs,dir)
*p = '\0';
p++;
REALLOC_MORE_IF_NEEDED(TOPDIR_LIST,TOPDIR_ENTRIES+1,TOPDIR_ALLOC);
- TOPDIR_ENTRY(TOPDIR_ENTRIES) = FS_XtNewString(temp);
+ TOPDIR_ENTRY(TOPDIR_ENTRIES) = XtNewString(temp);
SMESSAGE(TOPDIR_ENTRY(TOPDIR_ENTRIES))
TOPDIR_ENTRIES++;
temp=p;
@@ -1585,7 +1583,7 @@ static void SetDirectoryView(fs,dir)
}
}
- FS_XtFree(malloced_filter);
+ XtFree(malloced_filter);
changeLists(FS_FILE_SELECTION);
chdir(APP_DIR);
@@ -1965,7 +1963,7 @@ static Widget BuildMenu(parent,descrip,defaultdescrip,cb)
char *md,*d,*tmp;
m = XtCreatePopupShell("menu",
simpleMenuWidgetClass,parent,NULL,(Cardinal)0);
- md = d = FS_XtNewString(descrip);
+ md = d = XtNewString(descrip);
while (*d) {
while (isspace(*d)) *d++='\r';
while (*d && *d != '\n') {
@@ -1984,8 +1982,8 @@ static Widget BuildMenu(parent,descrip,defaultdescrip,cb)
*tmp='\0';
d = md;
if (!*d) {
- FS_XtFree(md);
- md = d = FS_XtNewString(defaultdescrip);
+ XtFree(md);
+ md = d = XtNewString(defaultdescrip);
}
while (d) {
tmp=strchr(d,'\n');
@@ -1997,7 +1995,7 @@ static Widget BuildMenu(parent,descrip,defaultdescrip,cb)
if (tmp) d=tmp+1;
else d=NULL;
}
- FS_XtFree(md);
+ XtFree(md);
return(m);
}
@@ -2028,8 +2026,8 @@ XawFileSelectionGetPath(w)
if (!path) path ="";
savestrcpy(tmp,path);
translateTildeInPath(tmp);
- if (PATH) FS_XtFree(PATH);
- PATH = FS_XtNewString(path);
+ XtFree(PATH);
+ PATH = XtNewString(path);
INFSMESSAGE(returning, PATH)
ENDMESSAGE(XawFileSelectionGetPath)
diff --git a/gv/src/Ghostview.c b/gv/src/Ghostview.c
index 60af366..5d48525 100644
--- a/gv/src/Ghostview.c
+++ b/gv/src/Ghostview.c
@@ -59,7 +59,6 @@
#include <signal.h>
#include "types.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
#include "misc.h"
@@ -518,7 +517,7 @@ Input(client_data, source, id)
struct record_list *ps_old = gvw->ghostview.ps_input;
gvw->ghostview.ps_input = ps_old->next;
if (ps_old->close) fclose(ps_old->fp);
- GV_XtFree((char *)ps_old);
+ XtFree((char *)ps_old);
}
/* Have to seek at the beginning of each section */
@@ -838,7 +837,7 @@ Destroy(w)
StopInterpreter(w);
XtReleaseGC(w, gvw->ghostview.gc);
XtReleaseGC(w, gvw->ghostview.highlight_gc);
- if (gvw->ghostview.input_buffer) GV_XtFree(gvw->ghostview.input_buffer);
+ XtFree(gvw->ghostview.input_buffer);
if (gvw->core.background_pixmap != XtUnspecifiedPixmap)
XFreePixmap(XtDisplay(w), gvw->core.background_pixmap);
ENDMESSAGE(Destroy)
@@ -1416,8 +1415,8 @@ StartInterpreter(w)
if (gvw->ghostview.disable_start) return;
argv[argc++] = gvw->ghostview.interpreter;
- if (app_res.antialias) dptr = device =
GV_XtNewString(gv_gs_x11_alpha_device);
- else dptr = device = GV_XtNewString(gv_gs_x11_device);
+ if (app_res.antialias) dptr = device = XtNewString(gv_gs_x11_alpha_device);
+ else dptr = device = XtNewString(gv_gs_x11_device);
while (isspace(*dptr)) dptr++;
while (*dptr) {
argv[argc++] = dptr;
@@ -1441,7 +1440,7 @@ StartInterpreter(w)
strcpy(parameter, "-sPDFPassword=");
password = quote_filename(gv_pdf_password);
strcat(parameter, password);
- GV_XtFree(password);
+ XtFree(password);
argv[argc++] = parameter;
}
@@ -1460,7 +1459,7 @@ StartInterpreter(w)
}
if (gvw->ghostview.arguments) {
- cptr = arguments = GV_XtNewString(gvw->ghostview.arguments);
+ cptr = arguments = XtNewString(gvw->ghostview.arguments);
while (isspace(*cptr)) cptr++;
while (*cptr) {
argv[argc++] = cptr;
@@ -1629,8 +1628,8 @@ StartInterpreter(w)
XtAppAddInput(XtWidgetToApplicationContext(w), std_err[0],
(XtPointer)XtInputReadMask, Output, (XtPointer)w);
}
- if (arguments) GV_XtFree(arguments);
- if (device) GV_XtFree(device);
+ XtFree(arguments);
+ XtFree(device);
gvw->ghostview.background_cleared=0;
ENDMESSAGE(StartInterpreter)
@@ -1669,7 +1668,7 @@ StopInterpreter(w)
if (ps_old->close) fclose(ps_old->fp);
- GV_XtFree((char *)ps_old);
+ XtFree((char *)ps_old);
}
}
@@ -2137,7 +2136,7 @@ GhostviewSendPS(Widget w, FILE *fp, gv_off_t begin,
gv_off_t len, Bool doclose)
struct record_list *ps_new;
if (gvw->ghostview.interpreter_input < 0) return False;
- ps_new = (struct record_list *) GV_XtMalloc(sizeof (struct record_list));
+ ps_new = (struct record_list *) XtMalloc(sizeof (struct record_list));
ps_new->fp = fp;
ps_new->begin = begin;
ps_new->len = len;
@@ -2146,7 +2145,7 @@ GhostviewSendPS(Widget w, FILE *fp, gv_off_t begin,
gv_off_t len, Bool doclose)
ps_new->next = NULL;
if (gvw->ghostview.input_buffer == NULL) {
- gvw->ghostview.input_buffer = GV_XtMalloc(GV_BUFSIZ);
+ gvw->ghostview.input_buffer = XtMalloc(GV_BUFSIZ);
}
if (gvw->ghostview.ps_input == NULL) {
diff --git a/gv/src/Makefile.am b/gv/src/Makefile.am
index 86d7e7d..9b6c370 100644
--- a/gv/src/Makefile.am
+++ b/gv/src/Makefile.am
@@ -142,14 +142,6 @@ gv_SOURCES = Aaa.c \
Aaa_intern.h \
Aaa.h \
AaaP.h \
- d_memdebug.h \
- d_aaa_xtmem.h \
- d_fs_xtmem.h \
- d_gv_mem.h \
- d_gv_xtmem.h \
- d_proc_xtmem.h \
- d_ps_mem.h \
- d_ps_xtmem.h \
gv_message.h \
types.h \
gv-update-userconfig.in
@@ -283,10 +275,6 @@ if USE_SETENV_CODE
AM_CPPFLAGS += -DUSE_SETENV_CODE
endif
-if USE_MEMDEBUG_CODE
- gv_SOURCES += d_mem.c d_mem.h d_xtmem.c d_xtmem.h
-endif
-
install-data-local:
$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/safe-gs-workdir"
chmod 755 "$(DESTDIR)$(pkgdatadir)/safe-gs-workdir"
diff --git a/gv/src/Vlist.c b/gv/src/Vlist.c
index c3d1f59..c1392d8 100644
--- a/gv/src/Vlist.c
+++ b/gv/src/Vlist.c
@@ -50,8 +50,6 @@
#include "Frame.h"
#include INC_XMU(Converters.h)
-#include "d_memdebug.h"
-
#define VLIST_MARK_LEFT_INDENT 4
#define VLIST_MARK_LABEL_INTERNAL_WIDTH 11
#define VLIST_MARK_LABEL_INDENT 4
@@ -195,7 +193,7 @@ Cardinal *num_args; /* unused */
BEGINMESSAGE(Initialize)
if (vw->vlist.vlist) s = vw->vlist.vlist;
- vw->vlist.vlist = GV_XtNewString(s);
+ vw->vlist.vlist = XtNewString(s);
c = vw->vlist.vlist;
vw->vlist.firstVisible = 0;
vw->vlist.selected = -1;
@@ -295,8 +293,8 @@ Cardinal *num_args;
BEGINMESSAGE(SetValues)
if (nvw->vlist.vlist == NULL) nvw->vlist.vlist = "";
if (cvw->vlist.vlist != nvw->vlist.vlist) {
- GV_XtFree((char *)cvw->vlist.vlist);
- nvw->vlist.vlist = GV_XtNewString(nvw->vlist.vlist);
+ XtFree((char *)cvw->vlist.vlist);
+ nvw->vlist.vlist = XtNewString(nvw->vlist.vlist);
nvw->vlist.entries = (int)strlen(nvw->vlist.vlist);
if (!nvw->vlist.entries) nvw->vlist.entries =- 1;
SMESSAGE(nvw->vlist.vlist)
@@ -318,7 +316,7 @@ Widget w;
VlistWidget vw = (VlistWidget)w;
BEGINMESSAGE(Destroy)
- GV_XtFree(vw->vlist.vlist);
+ XtFree(vw->vlist.vlist);
XtReleaseGC(w,vw->vlist.background_GC);
XtReleaseGC(w,vw->vlist.mark_background_GC);
XtReleaseGC(w,vw->vlist.selected_background_GC);
diff --git a/gv/src/actions.c b/gv/src/actions.c
index 44ef394..1554112 100644
--- a/gv/src/actions.c
+++ b/gv/src/actions.c
@@ -70,7 +70,6 @@
#include "misc.h"
#include "options.h"
#include "version.h"
-#include "d_memdebug.h"
/*##################################################################*/
/* action_shellConfigureNotify */
@@ -191,9 +190,9 @@ action_page(w, event, params, num_params)
if (i > 0 && i == old_num_params) {
INFMESSAGE(freeing old parameters)
i = 0;
- while (i<old_num_params) GV_XtFree(old_params[i++]);
+ while (i<old_num_params) XtFree(old_params[i++]);
i = 0;
- GV_XtFree(old_params);
+ XtFree((XtPointer)old_params);
old_num_params=0;
old_params = NULL;
}
@@ -335,10 +334,10 @@ save_params:
if (i<*num_params) {
old_num_params = *num_params - i;
INFIMESSAGE(saving,old_num_params)
- old_params = (String*) GV_XtMalloc(old_num_params*sizeof(String));
+ old_params = (String*) XtMalloc(old_num_params*sizeof(String));
old=0;
while (i < *num_params) {
- old_params[old] = GV_XtNewString(params[i]);
+ old_params[old] = XtNewString(params[i]);
INFSMESSAGE(saving,old_params[old])
++i; old++;
}
diff --git a/gv/src/callbacks.c b/gv/src/callbacks.c
index f238800..00a3ad8 100644
--- a/gv/src/callbacks.c
+++ b/gv/src/callbacks.c
@@ -74,7 +74,6 @@
#include "actions.h"
#include "callbacks.h"
#include "confirm.h"
-#include "d_memdebug.h"
#include "file.h"
#include "ps.h"
#include "doc_misc.h"
@@ -204,13 +203,13 @@ cb_showTitle(w, client_data, call_data)
{
t = gv_filename;
}
- if (!t) t = s = GV_XtNewString(versionIdentification[0]);
+ if (!t) t = s = XtNewString(versionIdentification[0]);
else {
- s = GV_XtMalloc((4+strlen(t)+1)*sizeof(char));
+ s = XtMalloc((4+strlen(t)+1)*sizeof(char));
sprintf(s,"gv: %s",t);
}
} else {
- t = s = GV_XtNewString(versionIdentification[0]);
+ t = s = XtNewString(versionIdentification[0]);
}
if (w && XtWindow(w)) setTitle(gv_display, XtWindow(w), s, 0);
if (w && XtWindow(w)) setTitle(gv_display, XtWindow(w), t, 1);
@@ -226,7 +225,7 @@ cb_showTitle(w, client_data, call_data)
if (titlemenu) XtDestroyWidget(titlemenu);
titlemenu = build_label_menu(titlebutton, "title", t, bitmap);
}
- GV_XtFree(s);
+ XtFree(s);
ENDMESSAGE(cb_showTitle)
}
@@ -499,11 +498,11 @@ static void watch_file (client_data, idp)
struct stat sbuf;
INFMESSAGE(checking file)
- s = GV_XtNewString(gv_filename);
+ s = XtNewString(gv_filename);
error = stat(s, &sbuf);
if (!error && mtime != sbuf.st_mtime && sbuf.st_mtime < time(NULL))
cb_checkFile(NULL,(XtPointer)(CHECK_FILE_VERSION|CHECK_FILE_DATE),NULL);
- GV_XtFree(s);
+ XtFree(s);
}
}
if (timer) {
@@ -544,7 +543,7 @@ static char *make_pagelist(mode)
BEGINMESSAGE(make_pagelist)
if (toc_text && (mode&(PAGE_MODE_CURRENT|PAGE_MODE_MARKED))) {
char *tmp;
- pagelist = GV_XtNewString(VlistVlist(newtoc));
+ pagelist = XtNewString(VlistVlist(newtoc));
if (mode&PAGE_MODE_MARKED) {
tmp = pagelist;
while (*tmp) if (*tmp++=='*') { mode_valid=True; break; }
@@ -558,7 +557,7 @@ static char *make_pagelist(mode)
}
}
if (!mode_valid) {
- GV_XtFree(pagelist);
+ XtFree(pagelist);
pagelist=NULL;
}
ENDMESSAGE(make_pagelist)
@@ -612,7 +611,7 @@ cb_print(w, client_data, call_data)
gv_print_mode = (int)(intptr_t)client_data;
pagelist=get_pagelist(&gv_print_mode);
- if (pagelist) GV_XtFree(pagelist);
+ XtFree(pagelist);
if (gv_print_mode==PAGE_MODE_INVALID) {
INFMESSAGE(invalid print mode)
ENDMESSAGE(cb_print)
@@ -662,7 +661,7 @@ cb_print_pos(w, client_data, call_data)
gv_print_mode = (intptr_t)client_data;
pagelist=get_pagelist(&gv_print_mode);
- if (pagelist) GV_XtFree(pagelist);
+ XtFree(pagelist);
DialogPopupSetMessage(putTexCommandLabel);
DialogPopupSetPrompt(texCommandLabel);
@@ -728,11 +727,11 @@ cb_doPrint(w, client_data, call_data)
SaveData sd = save_allocSaveData();
sd->save_fn = NULL;
sd->src_fn = gv_filename_unc ?
- GV_XtNewString(gv_filename_unc) :
- GV_XtNewString(gv_filename);
+ XtNewString(gv_filename_unc) :
+ XtNewString(gv_filename);
sd->conv_fn = NULL;
- sd->pagelist = pagelist ? GV_XtNewString(pagelist) : NULL;
- sd->print_cmd = print_command ? GV_XtNewString(print_command) :
NULL;
+ sd->pagelist = pagelist ? XtNewString(pagelist) : NULL;
+ sd->print_cmd = print_command ? XtNewString(print_command) :
NULL;
sd->convert = gv_filename_dsc ? 1 : 0;
sd->save_to_file = (gv_print_kills_file || pagelist) ? 1 : 0;
sd->save_to_printer = 1;
@@ -742,11 +741,11 @@ cb_doPrint(w, client_data, call_data)
}
if (error) {
NotePopupShowMessage(error);
- GV_XtFree(error);
+ XtFree(error);
} else {
cb_popdownDialogPopup((Widget)NULL,(XtPointer)NULL,NULL);
}
- if (pagelist) GV_XtFree(pagelist);
+ XtFree(pagelist);
ENDMESSAGE(cb_doPrint)
}
@@ -791,7 +790,7 @@ cb_save(w, client_data, call_data)
gv_save_mode = (int)(intptr_t)client_data;
pagelist=get_pagelist(&gv_save_mode);
- if (pagelist) GV_XtFree(pagelist);
+ XtFree(pagelist);
if (gv_save_mode==PAGE_MODE_INVALID) {
INFMESSAGE(invalid save mode)
ENDMESSAGE(cb_save)
@@ -829,7 +828,7 @@ cb_save(w, client_data, call_data)
}
/* We assume the if ext was filled, then we'll definitely write PDF. */
- name = GV_XtNewString(name);
+ name = XtNewString(name);
if (gv_filename_dsc && *ext) name=file_pdfname2psname(name);
pathlen = strlen(path)+strlen(name)+strlen(ext);
@@ -838,7 +837,7 @@ cb_save(w, client_data, call_data)
strcat(default_path,ext);
XawFileSelectionSetPath(FileSel,default_path);
}
- GV_XtFree(name);
+ XtFree(name);
n=0;
XtSetArg(args[n], XtNtitle,title); ++n;
@@ -882,18 +881,18 @@ cb_doSave(w, client_data, call_data)
return;
}
cb_popdownNotePopup((Widget)NULL,(XtPointer)NULL,NULL);
- if (save_directory) GV_XtFree(save_directory);
+ XtFree(save_directory);
save_directory= file_getDirOfPath(name);
SMESSAGE(name)
pagelist=get_pagelist(&gv_save_mode);
if (gv_save_mode != PAGE_MODE_INVALID) {
SaveData sd = save_allocSaveData();
- sd->save_fn = name ? GV_XtNewString(name) : NULL;
+ sd->save_fn = name ? XtNewString(name) : NULL;
sd->src_fn = gv_filename_unc ?
- GV_XtNewString(gv_filename_unc) :
- GV_XtNewString(gv_filename);
+ XtNewString(gv_filename_unc) :
+ XtNewString(gv_filename);
sd->conv_fn = NULL;
- sd->pagelist = pagelist ? GV_XtNewString(pagelist) : NULL;
+ sd->pagelist = pagelist ? XtNewString(pagelist) : NULL;
sd->print_cmd = NULL;
sd->convert = (gv_filename_dsc && type==FILE_TYPE_PS) ? 1 : 0;
sd->save_to_file = 1;
@@ -904,11 +903,11 @@ cb_doSave(w, client_data, call_data)
}
if (error) {
NotePopupShowMessage(error);
- GV_XtFree(error);
+ XtFree(error);
} else {
XtPopdown(FileSel_popup);
}
- if (pagelist) GV_XtFree(pagelist);
+ XtFree(pagelist);
ENDMESSAGE(cb_doSave)
}
@@ -963,12 +962,12 @@ cb_doOpenFile(w, client_data, call_data)
BEGINMESSAGE(cb_doOpenFile)
name = XawFileSelectionGetPath(FileSel);
SMESSAGE(name)
- if (open_directory) GV_XtFree(open_directory);
+ XtFree(open_directory);
open_directory=file_getDirOfPath(name);
SMESSAGE(open_directory)
if ((error = misc_testFile(name))) {
XawFileSelectionScan(FileSel,XawFileSelectionRescan);
- GV_XtFree(error);
+ XtFree(error);
} else {
cb_popdownNotePopup((Widget)NULL,(XtPointer)NULL,NULL);
XtPopdown(FileSel_popup);
@@ -992,7 +991,7 @@ cb_reopen(w, client_data, call_data)
if ((error = misc_testFile(gv_filename))) {
NotePopupShowMessage(error);
- GV_XtFree(error);
+ XtFree(error);
} else {
cb_popdownNotePopup((Widget)NULL,(XtPointer)NULL,NULL);
show_page(REQUEST_REOPEN,NULL);
@@ -1470,41 +1469,39 @@ cb_shutdown(w, client_data, call_data)
process_kill_all_processes();
#if defined(DUMP_XTMEM) || defined(DUMP_MEM)
- if (gv_filename_dsc) GV_XtFree(gv_filename_dsc);
- if (gv_filename_unc) GV_XtFree(gv_filename_unc);
- if (gv_filename_old) GV_XtFree(gv_filename_old);
- if (gv_filename_raw) GV_XtFree(gv_filename_raw);
- if (gv_filename) GV_XtFree(gv_filename);
- if (doc) psfree(doc);
- if (olddoc) psfree(olddoc);
- if (gv_scales_res) GV_XtFree(gv_scales_res);
- if (gv_magmenu_entries) magmenu_freeMagMenuEntries(gv_magmenu_entries);
- if (gv_miscmenu_entries)
miscmenu_freeMiscMenuEntries(gv_miscmenu_entries);
- if (gv_scales) scale_freeScales(gv_scales);
- if (gv_medias_res) GV_XtFree(gv_medias_res);
- if (gv_medias) media_freeMedias(gv_medias);
- if (gv_user_defaults_file) GV_XtFree(gv_user_defaults_file);
- if (scaleEntry) GV_XtFree(scaleEntry);
- if (open_directory) GV_XtFree(open_directory);
- if (save_directory) GV_XtFree(save_directory);
- if (toc_text) GV_XtFree(toc_text);
- if (pagemediaEntry) GV_XtFree(pagemediaEntry);
- if (gv_dirs) GV_XtFree(gv_dirs);
- if (gv_filters) GV_XtFree(gv_filters);
- if (gv_filter) GV_XtFree(gv_filter);
- GV_XtFree(gv_magmenu_entries_res);
- GV_XtFree(gv_miscmenu_entries_res);
- GV_XtFree(gv_print_command);
- GV_XtFree(gv_uncompress_command);
- GV_XtFree(gv_gs_interpreter);
- GV_XtFree(gv_gs_cmd_scan_pdf);
- GV_XtFree(gv_gs_cmd_conv_pdf);
- GV_XtFree(gv_gs_x11_device);
- GV_XtFree(gv_gs_x11_alpha_device);
- GV_XtFree(gv_gs_arguments);
+ XtFree(gv_filename_dsc);
+ XtFree(gv_filename_unc);
+ XtFree(gv_filename_old);
+ XtFree(gv_filename_raw);
+ XtFree(gv_filename);
+ psfree(doc);
+ psfree(olddoc);
+ XtFree(gv_scales_res);
+ magmenu_freeMagMenuEntries(gv_magmenu_entries);
+ miscmenu_freeMiscMenuEntries(gv_miscmenu_entries);
+ scale_freeScales(gv_scales);
+ XtFree(gv_medias_res);
+ media_freeMedias(gv_medias);
+ XtFree(gv_user_defaults_file);
+ XtFree(scaleEntry);
+ XtFree(open_directory);
+ XtFree(save_directory);
+ XtFree(toc_text);
+ XtFree(pagemediaEntry);
+ XtFree(gv_dirs);
+ XtFree(gv_filters);
+ XtFree(gv_filter);
+ XtFree(gv_magmenu_entries_res);
+ XtFree(gv_miscmenu_entries_res);
+ XtFree(gv_print_command);
+ XtFree(gv_uncompress_command);
+ XtFree(gv_gs_interpreter);
+ XtFree(gv_gs_cmd_scan_pdf);
+ XtFree(gv_gs_cmd_conv_pdf);
+ XtFree(gv_gs_x11_device);
+ XtFree(gv_gs_x11_alpha_device);
+ XtFree(gv_gs_arguments);
resource_freeData();
- GV_MemoryDUMP
- GV_XtMemoryDUMP
#endif
XtDestroyApplicationContext(app_con);
ENDMESSAGE(cb_shutdown)
@@ -1624,9 +1621,8 @@ cb_setPassword(Widget w, XtPointer client_data, XtPointer
call_data)
password = DialogPopupGetText();
if (!password) password="";
- if (gv_pdf_password)
- GV_XtFree(gv_pdf_password);
- gv_pdf_password = GV_XtNewString(password);
+ XtFree(gv_pdf_password);
+ gv_pdf_password = XtNewString(password);
cb_popdownDialogPopup((Widget)NULL,(XtPointer)NULL,NULL);
cb_reopen(page,0,0);
diff --git a/gv/src/d_aaa_xtmem.h b/gv/src/d_aaa_xtmem.h
deleted file mode 100644
index bccda41..0000000
--- a/gv/src/d_aaa_xtmem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**
-** d_aaa_xtmem.h
-**
-** Copyright (C) 1996-1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_AAA_XTMEM_H_
-#define _GV_D_AAA_XTMEM_H_
-
-#ifdef GV_AAA_XTMEM_DEBUG
-
-# include "d_xtmem.h"
-# define AAA_XtMalloc(sss) d_XtMalloc ((Cardinal)(sss),
__LINE__,__FILE__,"AAA")
-# define AAA_XtRealloc(ppp,sss) d_XtRealloc ((char*)(ppp) ,
(Cardinal)(sss), __LINE__,__FILE__,"AAA")
-# define AAA_XtNewString(ppp) d_XtNewString ((char*)(ppp) ,
__LINE__,__FILE__,"AAA")
-# define AAA_XtFree(ppp) d_XtFree ((char*)(ppp) ,
__LINE__,__FILE__,"AAA")
-# define DUMP_XTMEM
-
-#else /* GV_AAA_XTMEM_DEBUG */
-
-# define AAA_XtMalloc(sss) XtMalloc ((Cardinal)(sss)
)
-# define AAA_XtRealloc(ppp,sss) XtRealloc ((char*)(ppp) ,
(Cardinal)(sss) )
-# define AAA_XtNewString(ppp) XtNewString ((char*)(ppp)
)
-# define AAA_XtFree(ppp) XtFree ((char*)(ppp)
)
-
-#endif /* GV_AAA_XTMEM_DEBUG */
-
-#endif /* _GV_D_AAA_XTMEM_H_ */
-
diff --git a/gv/src/d_fs_xtmem.h b/gv/src/d_fs_xtmem.h
deleted file mode 100644
index 290fa37..0000000
--- a/gv/src/d_fs_xtmem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**
-** d_fs_xtmem.h
-**
-** Copyright (C) 1996-1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_FS_XTMEM_H_
-#define _GV_D_FS_XTMEM_H_
-
-#ifdef GV_FS_XTMEM_DEBUG
-
-# include "d_xtmem.h"
-# define FS_XtMalloc(sss) d_XtMalloc ((Cardinal)(sss),
__LINE__,__FILE__,"FS")
-# define FS_XtRealloc(ppp,sss) d_XtRealloc ((char*)(ppp) ,
(Cardinal)(sss), __LINE__,__FILE__,"FS")
-# define FS_XtNewString(ppp) d_XtNewString ((char*)(ppp) ,
__LINE__,__FILE__,"FS")
-# define FS_XtFree(ppp) d_XtFree ((char*)(ppp) ,
__LINE__,__FILE__,"FS")
-# define DUMP_XTMEM
-
-#else /* GV_FS_XTMEM_DEBUG */
-
-# define FS_XtMalloc(sss) XtMalloc ((Cardinal)(sss)
)
-# define FS_XtRealloc(ppp,sss) XtRealloc ((char*)(ppp) ,
(Cardinal)(sss) )
-# define FS_XtNewString(ppp) XtNewString ((char*)(ppp)
)
-# define FS_XtFree(ppp) XtFree ((char*)(ppp)
)
-
-#endif /* GV_FS_XTMEM_DEBUG */
-
-#endif /* _GV_D_FS_XTMEM_H_ */
-
diff --git a/gv/src/d_gv_mem.h b/gv/src/d_gv_mem.h
deleted file mode 100644
index 01f0c2b..0000000
--- a/gv/src/d_gv_mem.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * d_gv_mem.h
- *
- * Copyright (C) 1995, 1996, 1997 Johannes Plass
- * Copyright (C) Jose E. Marchesi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU gv; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Johannes Plass
- * Department of Physics
- * Johannes Gutenberg University, Mainz, Germany
- *
- * Jose E. Marchesi (address@hidden)
- * GNU Project
- *
- */
-
-#ifndef _GV_D_GV_MEM_H_
-#define _GV_D_GV_MEM_H_
-
-#ifdef GV_GV_MEM_DEBUG
-
-# include "d_mem.h"
-# define GV_malloc(sss) d_malloc ((size_t)(sss)
,__LINE__,__FILE__,"GV")
-# define GV_realloc(ppp,sss) d_realloc ((void*) (ppp),(size_t)(sss)
,__LINE__,__FILE__,"GV")
-# define GV_free(ppp) d_free ((void*) (ppp)
,__LINE__,__FILE__,"GV")
-# define DUMP_MEM
-
-#else /* GV_GV_MEM_DEBUG */
-
-# define GV_malloc(sss) malloc ((size_t)(sss) )
-# define GV_realloc(ppp,sss) realloc ((void*) (ppp),(size_t)(sss) )
-# define GV_free(ppp) free ((void*) (ppp) )
-
-#endif /* GV_GV_MEM_DEBUG */
-
-#endif /* _GV_GV_MEM_H_ */
-
diff --git a/gv/src/d_gv_xtmem.h b/gv/src/d_gv_xtmem.h
deleted file mode 100644
index cf0df01..0000000
--- a/gv/src/d_gv_xtmem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**
-** d_gv_xtmem.h
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_GV_XTMEM_H_
-#define _GV_D_GV_XTMEM_H_
-
-#ifdef GV_GV_XTMEM_DEBUG
-
-# include "d_xtmem.h"
-# define GV_XtMalloc(sss) d_XtMalloc ((Cardinal)(sss),
__LINE__,__FILE__,"GV")
-# define GV_XtRealloc(ppp,sss) d_XtRealloc ((char*)(ppp) ,
(Cardinal)(sss), __LINE__,__FILE__,"GV")
-# define GV_XtNewString(ppp) d_XtNewString ((char*)(ppp) ,
__LINE__,__FILE__,"GV")
-# define GV_XtFree(ppp) d_XtFree ((char*)(ppp) ,
__LINE__,__FILE__,"GV")
-# define DUMP_XTMEM
-
-#else /* GV_GV_XTMEM_DEBUG */
-
-# define GV_XtMalloc(sss) XtMalloc ((Cardinal)(sss)
)
-# define GV_XtRealloc(ppp,sss) XtRealloc ((char*)(ppp) ,
(Cardinal)(sss) )
-# define GV_XtNewString(ppp) XtNewString ((char*)(ppp)
)
-# define GV_XtFree(ppp) XtFree ((char*)(ppp)
)
-
-#endif /* GV_GV_XTMEM_DEBUG */
-
-#endif /* _GV_D_GV_XTMEM_H_ */
-
diff --git a/gv/src/d_mem.c b/gv/src/d_mem.c
deleted file mode 100644
index 3a77680..0000000
--- a/gv/src/d_mem.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-**
-** d_mem.c
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-#include "ac_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "paths.h"
-#include INC_X11(Intrinsic.h)
-
-#include "d_mem.h"
-
-#define GV_MEMDEBUG_OUT stderr
-
-typedef struct _mem {
- int number;
- unsigned long adress;
-} adress;
-
-#define MAX_ADR 2000
-static adress ad[MAX_ADR];
-static int num = 0;
-
-#define MEMDEBUG_MESSAGE(ppp) \
- fprintf ( \
- GV_MEMDEBUG_OUT, \
- "%10s | %4s | %4s | %4s | %4s | %4s | %18s %4d\n", \
- ppp , \
- mem_num , \
- mem_matchnum , \
- call_type , \
- mem_routine , \
- mem_size , \
- call_module , \
- call_line \
- )
-
-#define USE_mem_AND_call_VARIABLES \
- char mem_inptr[20]; \
- char mem_outptr[20]; \
- char mem_num[10]; \
- char mem_matchnum[10]; \
- char mem_size[10]; \
- char *mem_routine; \
- char *call_type; \
- char call_module[40]; \
- int call_line
-
-#define FORMAT_call_module(fff) \
- { \
- char *pos = strrchr((fff),']'); \
- if (!pos) pos = strrchr((fff),':'); \
- if (!pos) pos = (fff); \
- else pos++; \
- strcpy(call_module,pos); \
- pos = strrchr(call_module,'.'); \
- if (pos) *pos = '\0'; \
- }
-
-#define FORMAT_mem_size(sss) \
- { \
- if (sss<0) mem_size[0]='\0'; \
- else sprintf(mem_size,"%4d",(sss)); \
- }
-
-#define FORMAT_mem_inptr(ppp) \
- { \
- sprintf(mem_inptr,"- %8lX",(long unsigned int)(ppp));\
- }
-
-#define FORMAT_mem_outptr(ppp) \
- { \
- sprintf(mem_outptr,"+ %8lX",(long unsigned int)(ppp));\
- }
-
-#define FORMAT_mem_num \
- { \
- sprintf(mem_num,"%4d",num); \
- }
-
-#define FORMAT_mem_matchnum(nnn) \
- { \
- if (nnn<0) mem_matchnum[0]='\0'; \
- else sprintf(mem_matchnum,"%4d",nnn); \
- }
-
-#define INIT_STACK
\
- if (num==0) {
\
- while (num<MAX_ADR) { ad[num].number=-1; num++; }
\
- num=0;
\
- ad[1].number=-2;
\
- fprintf(GV_MEMDEBUG_OUT,
\
- " Adress | Num | Corr | Type | Func | Size | File
Line\n");\
- }
-
-#define ADD_TO_STACK(aaa)
\
- {
\
- int i=0;
\
- while (i<MAX_ADR && ad[i].number >=0) ++i;
\
- if (i==MAX_ADR)
\
- fprintf(GV_MEMDEBUG_OUT,"D_MEM.C: Warning, stack too small.\n");
\
- else {
\
- if (ad[i].number == -2) {
\
- if (i==MAX_ADR-1)
\
- fprintf(GV_MEMDEBUG_OUT,"D_MEM.C: Warning, stack exhausted.\n");
\
- else
\
- ad[i+1].number = -2;
\
- }
\
- ad[i].number = num;
\
- ad[i].adress = (unsigned long) aaa;
\
- }
\
- }
-
-#define INCREMENT_STACK ++num
-
-#define GET_mem_matchnum(ppp) \
- { \
- int i=0; \
- mem_matchnum[0] = '\0'; \
- while (ad[i].number > -2 && i<MAX_ADR) { \
- if (ad[i].number > -1 && ad[i].adress == (unsigned long) ppp) { \
- FORMAT_mem_matchnum(ad[i].number) \
- ad[i].number = -1; \
- break; \
- } \
- ++i; \
- } \
- }
-
-
-void *d_malloc(size,line,file,caller)
- size_t size;
- int line;
- char *file;
- char *caller;
-{
- char *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- outptr = malloc(size);
-
- mem_inptr[0]='\0';
- FORMAT_mem_outptr(outptr);
- FORMAT_mem_num;
- mem_matchnum[0] = '\0';
- FORMAT_mem_size(size);
- mem_routine = "mall";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-void *d_calloc(count,size,line,file,caller)
- size_t count;
- size_t size;
- int line;
- char *file;
- char *caller;
-{
- void *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- outptr = calloc(count,size);
-
- mem_inptr[0]='\0';
- FORMAT_mem_outptr(outptr);
- FORMAT_mem_num;
- mem_matchnum[0] = '\0';
- FORMAT_mem_size(size);
- mem_routine = "call";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-void *d_realloc(inptr,size,line,file,caller)
- void *inptr;
- size_t size;
- int line;
- char *file;
- char *caller;
-{
- void *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- FORMAT_mem_inptr(inptr);
- FORMAT_mem_num;
- GET_mem_matchnum(inptr);
- FORMAT_mem_size(-1);
- mem_routine = "real";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_inptr);
-
- outptr = realloc(inptr,size);
-
- FORMAT_mem_size(size);
- FORMAT_mem_outptr(outptr);
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-void d_free(inptr,line,file,caller)
- void *inptr;
- int line;
- char *file;
- char *caller;
-{
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- mem_outptr[0]='\0';
- FORMAT_mem_inptr(inptr);
- FORMAT_mem_num;
- GET_mem_matchnum(inptr);
- FORMAT_mem_size(-1);
- mem_routine = "free";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_inptr);
-
- free(inptr);
-
- INCREMENT_STACK;
- return;
-}
-
-void d_cfree(inptr,line,file,caller)
- void *inptr;
- int line;
- char *file;
- char *caller;
-{
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- mem_outptr[0]='\0';
- FORMAT_mem_inptr(inptr);
- FORMAT_mem_num;
- GET_mem_matchnum(inptr);
- FORMAT_mem_size(-1);
- mem_routine = "cfre";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_inptr);
-
- free(inptr);
-
- INCREMENT_STACK;
- return;
-}
-
-void d_MemDump()
-{
- int i=0;
- int j=0;
-
- if (!num) {
- fprintf(GV_MEMDEBUG_OUT,"MemDebug: no call registered.\n");
- return;
- }
- fprintf(GV_MEMDEBUG_OUT,"MemDebug: Unresolved calls:\n");
- while (i<MAX_ADR && ad[i].number>-2) {
- if (ad[i].number>=0)
- fprintf(GV_MEMDEBUG_OUT,"? %8lX | %7d\n",(unsigned
long)(ad[i].adress),ad[i].number);
- if (ad[i].number==-1) ++j;
- ++i;
- }
- if (i==j) fprintf(GV_MEMDEBUG_OUT," None\n");
- fprintf(GV_MEMDEBUG_OUT,"MemDebug: %d out of %d stack positions are
unused.\n",j,i);
- if (i==j) fprintf(GV_MEMDEBUG_OUT,"MemDebug: Stack is CLEAN !\n");
-}
diff --git a/gv/src/d_mem.h b/gv/src/d_mem.h
deleted file mode 100644
index c8289eb..0000000
--- a/gv/src/d_mem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-**
-** d_mem.h
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-
-
-#ifndef _GV_D_MEM_H_
-#define _GV_D_MEM_H_
-
-extern void * d_calloc (
-#if NeedFunctionPrototypes
- size_t,
- size_t,
- int,
- char *,
- char *
-#endif
-);
-
-extern void * d_malloc (
-#if NeedFunctionPrototypes
- size_t,
- int,
- char *,
- char *
-#endif
-);
-
-extern void * d_realloc (
-#if NeedFunctionPrototypes
- void *,
- size_t,
- int,
- char *,
- char *
-#endif
-);
-
-void d_free (
-#if NeedFunctionPrototypes
- void *,
- int,
- char *,
- char *
-#endif
-);
-
-void d_cfree (
-#if NeedFunctionPrototypes
- void *,
- int,
- char *,
- char *
-#endif
-);
-
-extern void d_MemDump (
-#if NeedFunctionPrototypes
-#endif
-);
-
-#endif /* _GV_D_MEM_H_ */
-
diff --git a/gv/src/d_memdebug.h b/gv/src/d_memdebug.h
deleted file mode 100644
index b7d6150..0000000
--- a/gv/src/d_memdebug.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-**
-** d_memdebug.h
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_MEMDEBUG_H_
-#define _GV_D_MEMDEBUG_H_
-
-/*=====================================================*/
-/*=== Define an item below to trace memory usage for */
-/*=== the corresponding group of malloc/free calls. */
-/*=====================================================*/
-
-/*
-#define GV_FS_XTMEM_DEBUG
-#define GV_PS_MEM_DEBUG
-#define GV_PS_XTMEM_DEBUG
-#define GV_AAA_MEM_DEBUG
-#define GV_GV_MEM_DEBUG
-#define GV_GV_XTMEM_DEBUG
-#define GV_PROC_XTMEM_DEBUG
-*/
-
-/*=====================================================*/
-
-#include "d_gv_mem.h"
-#include "d_ps_mem.h"
-#if defined(XtNumber) /* Intrinsic.h loaded */
-# include "d_aaa_xtmem.h"
-# include "d_fs_xtmem.h"
-# include "d_gv_xtmem.h"
-# include "d_proc_xtmem.h"
-# include "d_ps_xtmem.h"
-#endif
-
-#ifdef DUMP_XTMEM
-# define GV_XtMemoryDUMP d_XtMemDump();
-#else
-# define GV_XtMemoryDUMP
-#endif
-
-#ifdef DUMP_MEM
-# define GV_MemoryDUMP d_MemDump();
-#else
-# define GV_MemoryDUMP
-#endif
-
-#endif /* _GV_D_MEMDEBUG_H_ */
-
-
-
-
-
diff --git a/gv/src/d_proc_xtmem.h b/gv/src/d_proc_xtmem.h
deleted file mode 100644
index 2559998..0000000
--- a/gv/src/d_proc_xtmem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**
-** d_proc_xtmem.h
-**
-** Copyright (C) 1996-1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_PROC_XTMEM_H_
-#define _GV_D_PROC_XTMEM_H_
-
-#ifdef GV_PROC_XTMEM_DEBUG
-
-# include "d_xtmem.h"
-# define PROC_XtMalloc(sss) d_XtMalloc ((Cardinal)(sss),
__LINE__,__FILE__,"PROC")
-# define PROC_XtRealloc(ppp,sss) d_XtRealloc ((char*)(ppp) ,
(Cardinal)(sss), __LINE__,__FILE__,"PROC")
-# define PROC_XtNewString(ppp) d_XtNewString ((char*)(ppp) ,
__LINE__,__FILE__,"PROC")
-# define PROC_XtFree(ppp) d_XtFree ((char*)(ppp) ,
__LINE__,__FILE__,"PROC")
-# define DUMP_XTMEM
-
-#else /* GV_PROC_XTMEM_DEBUG */
-
-# define PROC_XtMalloc(sss) XtMalloc ((Cardinal)(sss)
)
-# define PROC_XtRealloc(ppp,sss) XtRealloc ((char*)(ppp) ,
(Cardinal)(sss) )
-# define PROC_XtNewString(ppp) XtNewString ((char*)(ppp)
)
-# define PROC_XtFree(ppp) XtFree ((char*)(ppp)
)
-
-#endif /* GV_PROC_XTMEM_DEBUG */
-
-#endif /* _GV_D_PROC_XTMEM_H_ */
-
diff --git a/gv/src/d_ps_mem.h b/gv/src/d_ps_mem.h
deleted file mode 100644
index 15aa121..0000000
--- a/gv/src/d_ps_mem.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-**
-** d_ps_mem.h.h
-**
-** Copyright (C) 1996-1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_PS_MEM_H_
-#define _GV_D_PS_MEM_H_
-
-#ifdef GV_PS_MEM_DEBUG
-
-# include "d_mem.h"
-# define PS_malloc(sss) d_malloc ((size_t)(sss)
,__LINE__,__FILE__,"PS")
-# define PS_calloc(ccc,sss) d_calloc ((size_t)(ccc),(size_t)(sss)
,__LINE__,__FILE__,"PS")
-# define PS_realloc(ppp,sss) d_realloc ((void*) (ppp),(size_t)(sss)
,__LINE__,__FILE__,"PS")
-# define PS_free(ppp) d_free ((void*) (ppp)
,__LINE__,__FILE__,"PS")
-# define PS_cfree(ppp) d_cfree ((void*) (ppp)
,__LINE__,__FILE__,"PS")
-# define DUMP_MEM
-
-#else /* GV_PS_MEM_DEBUG */
-
-# define PS_malloc(sss) malloc ((size_t)(sss) )
-# define PS_calloc(ccc,sss) calloc ((size_t)(ccc),(size_t)(sss) )
-# define PS_realloc(ppp,sss) realloc ((void*) (ppp),(size_t)(sss) )
-# define PS_free(ppp) free ((void*) (ppp) )
-# define PS_cfree(ppp) cfree ((void*) (ppp) )
-
-#endif /* GV_PS_MEM_DEBUG */
-
-#endif /* _GV_PS_MEM_H_ */
-
diff --git a/gv/src/d_ps_xtmem.h b/gv/src/d_ps_xtmem.h
deleted file mode 100644
index eb88448..0000000
--- a/gv/src/d_ps_xtmem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**
-** d_ps_xtmem.h
-**
-** Copyright (C) 1996-1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_D_PS_XTMEM_H_
-#define _GV_D_PS_XTMEM_H_
-
-#ifdef GV_PS_XTMEM_DEBUG
-
-# include "d_xtmem.h"
-# define PS_XtMalloc(sss) d_XtMalloc ((Cardinal)(sss),
__LINE__,__FILE__,"PS")
-# define PS_XtRealloc(ppp,sss) d_XtRealloc ((char*)(ppp) ,
(Cardinal)(sss), __LINE__,__FILE__,"PS")
-# define PS_XtNewString(ppp) d_XtNewString ((char*)(ppp) ,
__LINE__,__FILE__,"PS")
-# define PS_XtFree(ppp) d_XtFree ((char*)(ppp) ,
__LINE__,__FILE__,"PS")
-# define DUMP_XTMEM
-
-#else /* GV_PS_XTMEM_DEBUG */
-
-# define PS_XtMalloc(sss) XtMalloc ((Cardinal)(sss)
)
-# define PS_XtRealloc(ppp,sss) XtRealloc ((char*)(ppp) ,
(Cardinal)(sss) )
-# define PS_XtNewString(ppp) XtNewString ((char*)(ppp)
)
-# define PS_XtFree(ppp) XtFree ((char*)(ppp)
)
-
-#endif /* GV_PS_XTMEM_DEBUG */
-
-#endif /* _GV_D_PS_XTMEM_H_ */
-
diff --git a/gv/src/d_xtmem.c b/gv/src/d_xtmem.c
deleted file mode 100644
index 550fed7..0000000
--- a/gv/src/d_xtmem.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-**
-** d_xtmem.c
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-*/
-#include "ac_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "paths.h"
-#include INC_X11(Intrinsic.h)
-
-#include "d_xtmem.h"
-
-#define GV_MEMDEBUG_OUT stderr
-
-typedef struct _mem {
- int number;
- unsigned long adress;
-} adress;
-
-#define MAX_ADR 2000
-static adress ad[MAX_ADR];
-static int num = 0;
-
-
-#define MEMDEBUG_MESSAGE(ppp) \
- fprintf ( \
- GV_MEMDEBUG_OUT, \
- "%10s | %4s | %4s | %4s | %4s | %4s | %18s %4d\n", \
- ppp , \
- mem_num , \
- mem_matchnum , \
- call_type , \
- mem_routine , \
- mem_size , \
- call_module , \
- call_line \
- )
-
-#define USE_mem_AND_call_VARIABLES \
- char mem_inptr[20]; \
- char mem_outptr[20]; \
- char mem_num[10]; \
- char mem_matchnum[10]; \
- char mem_size[10]; \
- char *mem_routine; \
- char *call_type; \
- char call_module[40]; \
- int call_line
-
-#define FORMAT_call_module(fff) \
- { \
- char *pos = strrchr((fff),']'); \
- if (!pos) pos = strrchr((fff),':'); \
- if (!pos) pos = (fff); \
- else pos++; \
- strcpy(call_module,pos); \
- pos = strrchr(call_module,'.'); \
- if (pos) *pos = '\0'; \
- }
-
-#define FORMAT_mem_size(sss) \
- { \
- if (sss<0) mem_size[0]='\0'; \
- else sprintf(mem_size,"%4d",(sss)); \
- }
-
-#define FORMAT_mem_inptr(ppp) \
- { \
- sprintf(mem_inptr,"- %8lX",(long unsigned int)(ppp));\
- }
-
-#define FORMAT_mem_outptr(ppp) \
- { \
- sprintf(mem_outptr,"+ %8lX",(long unsigned int)(ppp));\
- }
-
-#define FORMAT_mem_num \
- { \
- sprintf(mem_num,"%4d",num); \
- }
-
-#define FORMAT_mem_matchnum(nnn) \
- { \
- if (nnn<0) mem_matchnum[0]='\0'; \
- else sprintf(mem_matchnum,"%4d",nnn); \
- }
-
-#define INIT_STACK
\
- if (num==0) {
\
- while (num<MAX_ADR) { ad[num].number=-1; num++; }
\
- num=0;
\
- ad[1].number=-2;
\
- fprintf(GV_MEMDEBUG_OUT,
\
- " Adress | Num | Corr | Type | Func | Size | File
Line\n");\
- }
-
-#define ADD_TO_STACK(aaa)
\
- {
\
- int i=0;
\
- while (i<MAX_ADR && ad[i].number >=0) ++i;
\
- if (i==MAX_ADR)
\
- fprintf(GV_MEMDEBUG_OUT,"D_XTMEM.C: Warning, stack too small.\n");
\
- else {
\
- if (ad[i].number == -2) {
\
- if (i==MAX_ADR-1)
\
- fprintf(GV_MEMDEBUG_OUT,"D_XTMEM.C: Warning, stack
exhausted.\n"); \
- else
\
- ad[i+1].number = -2;
\
- }
\
- ad[i].number = num;
\
- ad[i].adress = (unsigned long) aaa;
\
- }
\
- }
-
-#define INCREMENT_STACK ++num
-
-#define GET_mem_matchnum(ppp) \
- { \
- int i=0; \
- mem_matchnum[0] = '\0'; \
- while (ad[i].number > -2 && i<MAX_ADR) { \
- if (ad[i].number > -1 && ad[i].adress == (unsigned long) ppp) { \
- FORMAT_mem_matchnum(ad[i].number) \
- ad[i].number = -1; \
- break; \
- } \
- ++i; \
- } \
- }
-
-
-char * d_XtMalloc(size,line,file,caller)
- Cardinal size;
- int line;
- char *file;
- char *caller;
-{
- char *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- outptr = XtMalloc(size);
-
- mem_inptr[0]='\0';
- FORMAT_mem_outptr(outptr);
- FORMAT_mem_num;
- mem_matchnum[0] = '\0';
- FORMAT_mem_size(size);
- mem_routine = "XtM";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-char * d_XtRealloc(inptr,size,line,file,caller)
- char *inptr;
- Cardinal size;
- int line;
- char *file;
- char *caller;
-{
- char *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- FORMAT_mem_inptr(inptr);
- FORMAT_mem_num;
- GET_mem_matchnum(inptr);
- FORMAT_mem_size(-1);
- mem_routine = "XtR";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_inptr);
-
- outptr = XtRealloc(inptr,size);
-
- FORMAT_mem_size(size);
- FORMAT_mem_outptr(outptr);
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-String d_XtNewString(string,line,file,caller)
- String string;
- int line;
- char *file;
- char *caller;
-{
- char *outptr;
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- outptr = XtNewString(string);
-
- mem_inptr[0]='\0';
- FORMAT_mem_outptr(outptr);
- FORMAT_mem_num;
- mem_matchnum[0] = '\0';
- FORMAT_mem_size(-1);
- mem_routine = "XtNS";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_outptr);
-
- ADD_TO_STACK(outptr);
- INCREMENT_STACK;
- return outptr;
-}
-
-void d_XtFree(inptr,line,file,caller)
- char *inptr;
- int line;
- char *file;
- char *caller;
-{
- USE_mem_AND_call_VARIABLES;
-
- INIT_STACK;
-
- mem_outptr[0]='\0';
- FORMAT_mem_inptr(inptr);
- FORMAT_mem_num;
- GET_mem_matchnum(inptr);
- FORMAT_mem_size(-1);
- mem_routine = "XtF";
- call_type = caller;
- FORMAT_call_module(file);
- call_line = line;
- MEMDEBUG_MESSAGE(mem_inptr);
-
- XtFree(inptr);
-
- INCREMENT_STACK;
- return;
-}
-
-void d_XtMemDump()
-{
- int i=0;
- int j=0;
-
- if (!num) {
- fprintf(GV_MEMDEBUG_OUT,"XtMemDebug: no call registered.\n");
- return;
- }
- fprintf(GV_MEMDEBUG_OUT,"XtMemDebug: Unresolved calls:\n");
- while (i<MAX_ADR && ad[i].number>-2) {
- if (ad[i].number>=0)
- fprintf(GV_MEMDEBUG_OUT,"? %8lX | %7d\n",(unsigned
long)(ad[i].adress),ad[i].number);
- if (ad[i].number==-1) ++j;
- ++i;
- }
- if (i==j) fprintf(GV_MEMDEBUG_OUT," None\n");
- fprintf(GV_MEMDEBUG_OUT,"XtMemDebug: %d out of %d stack positions are
unused.\n",j,i);
- if (i==j) fprintf(GV_MEMDEBUG_OUT,"XtMemDebug: Stack is CLEAN !\n");
-}
diff --git a/gv/src/d_xtmem.h b/gv/src/d_xtmem.h
deleted file mode 100644
index c16c888..0000000
--- a/gv/src/d_xtmem.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-**
-** d_xtmem.h
-**
-** Copyright (C) 1995, 1996, 1997 Johannes Plass
-** Copyright (C) 2004 Jose E. Marchesi
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with GNU gv; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-** Author: Johannes Plass (address@hidden)
-** Department of Physics
-** Johannes Gutenberg-University
-** Mainz, Germany
-**
-** Jose E. Marchesi (address@hidden)
-** GNU Project
-**
-*/
-
-#ifndef _GV_d_XtMem_H_
-#define _GV_d_XtMem_H_
-
-extern char * d_XtMalloc (
-#if NeedFunctionPrototypes
- Cardinal,
- int,
- char *,
- char *
-#endif
-);
-
-extern char * d_XtRealloc (
-#if NeedFunctionPrototypes
- char *,
- Cardinal,
- int,
- char *,
- char *
-#endif
-);
-
-extern char * d_XtNewString (
-#if NeedFunctionPrototypes
- String,
- int,
- char *,
- char *
-#endif
-);
-
-void d_XtFree (
-#if NeedFunctionPrototypes
- char *,
- int,
- char *,
- char *
-#endif
-);
-
-void d_XtMemDump (
-#if NeedFunctionPrototypes
-#endif
-);
-
-#endif /* _GV_d_XtMem_H_ */
-
-
-
diff --git a/gv/src/error.c b/gv/src/error.c
index 8556fce..b220c84 100644
--- a/gv/src/error.c
+++ b/gv/src/error.c
@@ -51,7 +51,6 @@
#include "error.h"
#include "main_resources.h"
#include "main_globals.h"
-#include "d_memdebug.h"
char*
open_fail_error(errornumber,error_str,file_name,show)
@@ -70,7 +69,7 @@ open_fail_error(errornumber,error_str,file_name,show)
} else {
char buf[1024];
sprintf(buf,"%s %s: %s",error_str,file_name,m);
- m = GV_XtNewString(buf);
+ m = XtNewString(buf);
}
ENDMESSAGE(open_fail_error_message)
return(m);
diff --git a/gv/src/file.c b/gv/src/file.c
index 65acd05..3bbd617 100644
--- a/gv/src/file.c
+++ b/gv/src/file.c
@@ -58,7 +58,6 @@
#include "types.h"
#include "config.h"
-#include "d_memdebug.h"
#include "file.h"
#include "main_resources.h"
#include "main_globals.h"
@@ -81,7 +80,7 @@ file_getDirOfPath(path)
BEGINMESSAGE(file_getDirOfPath)
if (path) {
- dir=GV_XtNewString(path);
+ dir=XtNewString(path);
pos = strrchr(dir,'/');
if (pos) { pos++; *pos='\0'; }
}
@@ -195,7 +194,7 @@ file_getTmpFilename(const char *baseDirectory, const char
*baseFilename, int *fi
}
}
SMESSAGE(tempFilename)
- tempFilenameP = GV_XtNewString(tempFilename);
+ tempFilenameP = XtNewString(tempFilename);
ENDMESSAGE(file_getTmpFilename)
return(tempFilenameP);
}
@@ -333,7 +332,7 @@ file_getUsefulName(name)
ENDMESSAGE(file_getUsefulName)
return(name);
}
- mext = ext = GV_XtNewString(e);
+ mext = ext = XtNewString(e);
while (*ext) { *ext = tolower(*ext); ext++; }
if (!strncmp(mext,".gz",3)) ext = "";
else if (!strncmp(mext,".bz2",4)) ext = "";
@@ -349,7 +348,7 @@ file_getUsefulName(name)
ext=mext;
while (*ext && *e) *ext++=*e++;
strcpy(c,mext);
- GV_XtFree(mext);
+ XtFree(mext);
INFSMESSAGE(out,name)
ENDMESSAGE(file_getUsefulName)
return(name);
diff --git a/gv/src/gv_signal.c b/gv/src/gv_signal.c
index 7acb727..e1b404a 100644
--- a/gv/src/gv_signal.c
+++ b/gv/src/gv_signal.c
@@ -60,7 +60,6 @@
#include "types.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
#include "gv_signal.h"
@@ -149,10 +148,10 @@ static void signal_scb_updateFile(client_data,sidP)
if (gv_filename) {
String s;
struct stat sbuf;
- s = GV_XtNewString(gv_filename);
+ s = XtNewString(gv_filename);
if (!stat(s, &sbuf) && mtime != sbuf.st_mtime)
cb_checkFile(NULL,(XtPointer)CHECK_FILE_VERSION,NULL);
- GV_XtFree(s);
+ XtFree(s);
}
block_updateFile = 0;
ENDMESSAGE(signal_scb_updateFile)
diff --git a/gv/src/gv_string.c b/gv/src/gv_string.c
index 64459ed..03b4804 100644
--- a/gv/src/gv_string.c
+++ b/gv/src/gv_string.c
@@ -48,7 +48,6 @@
#include INC_X11(Intrinsic.h)
#include "types.h"
-#include "d_memdebug.h"
char* mprintf(char* fmt,...)
{
@@ -73,7 +72,7 @@ char* mprintf(char* fmt,...)
}
}
va_end(a);
- p = GV_XtMalloc(l*sizeof(char));
+ p = XtMalloc(l*sizeof(char));
va_start(a,fmt);
vsprintf(p,fmt,a);
va_end(a);
diff --git a/gv/src/magmenu.c b/gv/src/magmenu.c
index 7c8bd4c..b6dec41 100644
--- a/gv/src/magmenu.c
+++ b/gv/src/magmenu.c
@@ -52,7 +52,6 @@
#include "actions.h"
#include "magmenu.h"
#include "options.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
#include "zoom.h"
@@ -67,11 +66,11 @@ void magmenu_freeMagMenuEntries(entries)
int i=0;
BEGINMESSAGE(magmenu_freeMagMenuEntries)
while (entries[i]) {
- if (entries[i]->name) GV_XtFree(entries[i]->name);
- GV_XtFree(entries[i]);
+ XtFree(entries[i]->name);
+ XtFree((XtPointer)entries[i]);
i++;
}
- if (entries) GV_XtFree(entries);
+ XtFree((XtPointer)entries);
ENDMESSAGE(magmenu_freeMagMenuEntries)
}
@@ -82,7 +81,7 @@ void magmenu_freeMagMenuEntries(entries)
static MagMenuEntry magmenu_mallocMagMenuEntry(void)
{
MagMenuEntry entry;
- entry = (MagMenuEntry) GV_XtMalloc(sizeof(MagMenuEntryStruct));
+ entry = (MagMenuEntry) XtMalloc(sizeof(MagMenuEntryStruct));
memset((void*)entry ,0,sizeof(MagMenuEntryStruct));
return entry;
}
@@ -101,7 +100,7 @@ MagMenuEntry *magmenu_parseMagMenuEntries(s)
s =options_squeezeMultiline(s);
for (n=1,c=s; (c = strchr(c,'\n')); n++, c++);
INFIMESSAGE(number of medias,n)
- mentries = entries = (MagMenuEntry*) GV_XtMalloc((n+2)*sizeof(MagMenuEntry));
+ mentries = entries = (MagMenuEntry*) XtMalloc((n+2)*sizeof(MagMenuEntry));
c=s;
if (*s) while (n>0) {
nl = strchr(c,'\n');
@@ -111,7 +110,7 @@ MagMenuEntry *magmenu_parseMagMenuEntries(s)
else i=sscanf(c," %[^,] , %f ",name,&f);
if (i==2 && f>0) {
entry = magmenu_mallocMagMenuEntry();
- entry->name = GV_XtNewString(name);
+ entry->name = XtNewString(name);
entry->scale= sqrt(f);
have_entry = 1;
INFSMESSAGE(found entry,entry->name)
@@ -123,12 +122,12 @@ MagMenuEntry *magmenu_parseMagMenuEntries(s)
}
if (!have_entry) {
entry = magmenu_mallocMagMenuEntry();
- entry->name = GV_XtNewString(" 2 ");
+ entry->name = XtNewString(" 2 ");
entry->scale= sqrt(2.0);
*entries++ = entry;
}
*entries = (MagMenuEntry) NULL;
- GV_XtFree(s);
+ XtFree(s);
ENDMESSAGE(magmenu_parseMagMenuEntries)
return(mentries);
}
@@ -174,7 +173,7 @@ magmenu_a_magMenu (w, event, params, num_params)
if (d) {
INFMESSAGE(resetting)
if (d->menuwidget) XtDestroyWidget(d->menuwidget);
- GV_XtFree((char*)d);
+ XtFree((char*)d);
d = (magMenu_data *)NULL;
}
mode = MAG_INIT_0;
@@ -204,7 +203,7 @@ magmenu_a_magMenu (w, event, params, num_params)
if (mode&MAG_BEGIN) {
INFMESSAGE(MAG_BEGIN)
gvw = w;
- d = (magMenu_data *) GV_XtMalloc(sizeof(magMenu_data));
+ d = (magMenu_data *) XtMalloc(sizeof(magMenu_data));
d->locx1 = event->xbutton.x;
d->locy1 = event->xbutton.y;
d->menuwidget = NULL;
diff --git a/gv/src/main.c b/gv/src/main.c
index f109ab8..dc2b773 100644
--- a/gv/src/main.c
+++ b/gv/src/main.c
@@ -82,7 +82,6 @@
#include "actions.h"
#include "callbacks.h"
#include "confirm.h"
-#include "d_memdebug.h"
#include "dialog.h"
#include "error.h"
#include "file.h"
@@ -456,11 +455,11 @@ int main(argc, argv)
*/
const char *xufsp="XUSERFILESEARCHPATH";
char *xuf;
- xuf = getenv(xufsp); if (xuf) xuf = GV_XtNewString(xuf);
+ xuf = getenv(xufsp); if (xuf) xuf = XtNewString(xuf);
gnu_gv_setenv(xufsp,"___",1);
gv_display = XtOpenDisplay(app_con,NULL,NULL,gv_class,NULL,0,&argc,argv);
- if (xuf) { gnu_gv_setenv(xufsp,xuf,1); GV_XtFree(xuf); } else
gnu_gv_unsetenv(xufsp);
+ if (xuf) { gnu_gv_setenv(xufsp,xuf,1); XtFree(xuf); } else
gnu_gv_unsetenv(xufsp);
if (gv_display)
XtGetApplicationNameAndClass(gv_display,&gv_name,&gv_class);
SMESSAGE(gv_name) SMESSAGE(gv_class)
@@ -634,7 +633,7 @@ int main(argc, argv)
exit(0);
case PASSWORD_ARG:
- gv_pdf_password = GV_XtNewString(optarg);
+ gv_pdf_password = XtNewString(optarg);
break;
case SPARTAN_ARG:
@@ -739,20 +738,20 @@ int main(argc, argv)
app_res.minimum_height = app_res.minimum_height < 300 ? 300 :
app_res.minimum_height;
gv_medias_res =
resource_getResource(gv_database,gv_class,gv_name,"medias","Medias");
- gv_medias_res = GV_XtNewString(gv_medias_res);
+ gv_medias_res = XtNewString(gv_medias_res);
gv_medias = media_parseMedias(gv_medias_res);
gv_num_std_pagemedia = media_numMedias(gv_medias);
gv_magmenu_entries_res =
resource_getResource(gv_database,gv_class,gv_name,"magMenu","MagMenu");
- gv_magmenu_entries_res = GV_XtNewString(gv_magmenu_entries_res);
+ gv_magmenu_entries_res = XtNewString(gv_magmenu_entries_res);
gv_magmenu_entries = magmenu_parseMagMenuEntries(gv_magmenu_entries_res);
gv_miscmenu_entries_res =
resource_getResource(gv_database,gv_class,gv_name,"miscMenuEntries","MiscMenuEntries");
- gv_miscmenu_entries_res = GV_XtNewString(gv_miscmenu_entries_res);
+ gv_miscmenu_entries_res = XtNewString(gv_miscmenu_entries_res);
gv_miscmenu_entries =
miscmenu_parseMiscMenuEntries(gv_miscmenu_entries_res);
gv_scales_res =
resource_getResource(gv_database,gv_class,gv_name,"scales","Scales");
- gv_scales_res = GV_XtNewString(gv_scales_res);
+ gv_scales_res = XtNewString(gv_scales_res);
gv_scales = scale_parseScales(gv_scales_res);
gv_scale_current = gv_scale_base_current = -1;
@@ -1217,7 +1216,7 @@ int main(argc, argv)
if (argc == optind + 1)
{
- gv_filename=GV_XtNewString(argv[optind]);
+ gv_filename=XtNewString(argv[optind]);
}
if (gv_filename && strcmp(gv_filename, "-")) {
@@ -1226,7 +1225,7 @@ int main(argc, argv)
clean_safe_tempdir();
exit(EXIT_STATUS_ERROR);
} else {
- GV_XtFree(gv_filename_old);
+ XtFree(gv_filename_old);
gv_filename_old = NULL;
}
}
@@ -1317,9 +1316,9 @@ int main(argc, argv)
XtSetArg(args[n], XtNdirs, &gv_dirs); n++;
XtSetArg(args[n], XtNfilter, &gv_filter); n++;
XtGetValues(FileSel,args,n);
- gv_filters = GV_XtNewString(gv_filters);
- gv_dirs = GV_XtNewString(gv_dirs);
- gv_filter = GV_XtNewString(gv_filter);
+ gv_filters = XtNewString(gv_filters);
+ gv_dirs = XtNewString(gv_dirs);
+ gv_filter = XtNewString(gv_filter);
/*### now we become visible
######################################################*/
@@ -1431,7 +1430,7 @@ void main_setInternResource(db,sP,name)
BEGINMESSAGE(main_setInternResource)
*sP = resource_getResource(db,gv_class,gv_class,name,NULL);
if (!*sP) *sP="";
- *sP = GV_XtNewString(*sP);
+ *sP = XtNewString(*sP);
ENDMESSAGE(main_setInternResource)
}
@@ -1570,7 +1569,7 @@ void main_createScaleMenu(void)
n=0;
scaleMenu = XtCreatePopupShell("menu",
simpleMenuWidgetClass,scaleButton,args,n);
for (i=0; gv_scales[i]; i++);
- scaleEntry = (Widget*) GV_XtMalloc(i*sizeof(Widget));
+ scaleEntry = (Widget*) XtMalloc(i*sizeof(Widget));
for (i=0; gv_scales[i]; i++) {
if (!have_line && !gv_scales[i]->is_base) {
XtCreateManagedWidget("line",
smeLineObjectClass,scaleMenu,NULL,(Cardinal)0);
diff --git a/gv/src/media.c b/gv/src/media.c
index 56eb0cc..6299450 100644
--- a/gv/src/media.c
+++ b/gv/src/media.c
@@ -46,7 +46,6 @@
#include "types.h"
#include "config.h"
#include "types.h"
-#include "d_memdebug.h"
#include "options.h"
#include "media.h"
@@ -60,11 +59,11 @@ void media_freeMedias(medias)
int i=0;
BEGINMESSAGE(media_freeMedias)
while (medias[i]) {
- if (medias[i]->name) GV_XtFree(medias[i]->name);
- GV_XtFree(medias[i]);
+ XtFree(medias[i]->name);
+ XtFree((XtPointer)medias[i]);
i++;
}
- if (medias) GV_XtFree(medias);
+ XtFree((XtPointer)medias);
ENDMESSAGE(media_freeMedias)
}
@@ -75,7 +74,7 @@ void media_freeMedias(medias)
static Media media_mallocMedia(void)
{
Media media;
- media = (Media) GV_XtMalloc(sizeof(MediaStruct));
+ media = (Media) XtMalloc(sizeof(MediaStruct));
memset((void*)media ,0,sizeof(MediaStruct));
return media;
}
@@ -93,9 +92,9 @@ Media *media_parseMedias(s)
s =options_squeezeMultiline(s);
for (n=1,c=s; (c = strchr(c,'\n')); n++, c++);
INFIMESSAGE(number of medias,n)
- mmedias = medias = (Media*) GV_XtMalloc((n+3)*sizeof(Media));
+ mmedias = medias = (Media*) XtMalloc((n+3)*sizeof(Media));
media = media_mallocMedia();
- media->name = GV_XtNewString("BBox");
+ media->name = XtNewString("BBox");
media->width= 0;
media->height= 0;
media->used= 1;
@@ -110,7 +109,7 @@ Media *media_parseMedias(s)
i=sscanf(c," %[^,] , %d %d ",name,&w,&h);
if (i==3 && w>0 && h>0) {
media = media_mallocMedia();
- media->name = GV_XtNewString(name);
+ media->name = XtNewString(name);
media->width= w;
media->height= h;
media->used= used;
@@ -125,7 +124,7 @@ Media *media_parseMedias(s)
}
if (!have_media) {
media = media_mallocMedia();
- media->name = GV_XtNewString("A4");
+ media->name = XtNewString("A4");
media->width= 595;
media->height= 842;
media->used= 1;
@@ -134,7 +133,7 @@ Media *media_parseMedias(s)
if (!have_used_media) mmedias[1]->used=1;
*medias = (Media) NULL;
- GV_XtFree(s);
+ XtFree(s);
ENDMESSAGE(media_parseMedias)
return(mmedias);
}
diff --git a/gv/src/misc.c b/gv/src/misc.c
index cc7950c..5cfebf1 100644
--- a/gv/src/misc.c
+++ b/gv/src/misc.c
@@ -118,7 +118,6 @@
#include "types.h"
#include "actions.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "file.h"
#include "ps.h"
#include "doc_misc.h"
@@ -195,7 +194,7 @@ misc_drawEyeGuide(w,d,x,y)
return;
}
if (!egd) {
- egd = (EyeGuideData) GV_XtMalloc(sizeof(EyeGuideDataStruct));
+ egd = (EyeGuideData) XtMalloc(sizeof(EyeGuideDataStruct));
egd->w = w;
egd->drawn = 0;
egd->timer = (XtIntervalId) 0;
@@ -235,7 +234,7 @@ misc_drawEyeGuide(w,d,x,y)
}
if (d & (EYEGUIDE_REMOVE|EYEGUIDE_RESET)) {
if (egd->timer) XtRemoveTimeOut(egd->timer);
- GV_XtFree((char*)egd);
+ XtFree((char*)egd);
egd = NULL;
}
ENDMESSAGE(misc_drawEyeGuide)
@@ -367,7 +366,7 @@ misc_openFile(name, fpP)
INFMESSAGE(file is not useful)
str="Invalid file: %s";
l = strlen(str) + strlen(name) + 1;
- error = GV_XtMalloc(l*sizeof(char));
+ error = XtMalloc(l*sizeof(char));
sprintf(error,str,name);
}
else if ((fp = fopen(name, "r")) == NULL) {
@@ -413,7 +412,7 @@ String misc_changeFile(name)
BEGINMESSAGE(misc_changeFile)
if (!name) name="";
- p = GV_XtMalloc((strlen(name)+5)*sizeof(char));
+ p = XtMalloc((strlen(name)+5)*sizeof(char));
strcpy(p,name);
if (strcmp(name,"-")) {
if (!b && file_fileIsNotUseful(p)) sprintf(p,"%s.ps",name); else b = True;
@@ -428,27 +427,27 @@ String misc_changeFile(name)
error = misc_openFile(name,&fp);
if (error) {
ENDMESSAGE(misc_changeFile)
- GV_XtFree(name);
+ XtFree(name);
return(error);
}
- if (gv_filename_old) GV_XtFree(gv_filename_old);
- if (gv_filename_raw) GV_XtFree(gv_filename_raw);
+ XtFree(gv_filename_old);
+ XtFree(gv_filename_raw);
gv_filename_old = gv_filename;
if (gv_filename_dsc) {
unlink(gv_filename_dsc);
- GV_XtFree(gv_filename_dsc);
+ XtFree(gv_filename_dsc);
gv_filename_dsc=NULL;
}
if (gv_filename_unc) {
unlink(gv_filename_unc);
- GV_XtFree(gv_filename_unc);
+ XtFree(gv_filename_unc);
gv_filename_unc=NULL;
}
if (gv_psfile) fclose(gv_psfile);
- gv_filename = GV_XtNewString(name);
- gv_filename_raw = GV_XtNewString(name);
+ gv_filename = XtNewString(name);
+ gv_filename_raw = XtNewString(name);
gv_filename_raw = file_getUsefulName(gv_filename_raw);
gv_psfile = fp;
if (strcmp(name,"-")) {
@@ -457,7 +456,7 @@ String misc_changeFile(name)
mtime = sbuf.st_mtime;
INFSMESSAGE(new,gv_filename)
}
- GV_XtFree(name);
+ XtFree(name);
ENDMESSAGE(misc_changeFile)
return(error);
}
@@ -477,7 +476,7 @@ String close_file(file,name)
char *error_close_fail = "Cannot close file %s\n";
size_t l;
l = strlen(error_close_fail) + strlen(name) + 1;
- error = GV_XtMalloc(l*sizeof(char));
+ error = XtMalloc(l*sizeof(char));
sprintf(error,error_close_fail,name);
}
ENDMESSAGE(close_file)
@@ -542,7 +541,7 @@ int mode;
}
NotePopupShowMessage(message);
}
- if (gv_filename!=tmpname) GV_XtFree(tmpname);
+ if (gv_filename!=tmpname) XtFree(tmpname);
ENDMESSAGE(check_file)
return(r);
}
@@ -783,7 +782,7 @@ show_page(number,data1)
error = misc_changeFile(filename);
if (error) {
NotePopupShowMessage(error);
- GV_XtFree(error);
+ XtFree(error);
ENDMESSAGE(show_page)
return;
}
@@ -898,14 +897,14 @@ setup_ghostview()
olddoc = doc;
doc = NULL;
current_page = NO_CURRENT_PAGE;
- if (toc_text) GV_XtFree(toc_text);
+ XtFree(toc_text);
oldtoc_entry_length = toc_entry_length;
toc_text = NULL;
INFMESSAGE(scanning file for structure information)
gv_filename_dsc = gv_filename_unc = NULL;
{
- char* tmp = GV_malloc(1512 );
+ char* tmp = malloc(1512);
char* src = gv_gs_cmd_scan_pdf;
char* dest = tmp;
int spaceFound = 0;
@@ -935,7 +934,7 @@ setup_ghostview()
&gv_filename_unc,gv_uncompress_command,
gv_scanstyle, gv_gs_safeDir);
- GV_free(tmp);
+ free(tmp);
}
{
int m;
@@ -1020,7 +1019,7 @@ setup_ghostview()
}
toc_entry_length = maxlen + 1;
toc_length = doc->numpages * toc_entry_length - 1;
- toc_text = GV_XtMalloc(toc_length + 2); /* include final NULL */
+ toc_text = XtMalloc(toc_length + 2); /* include final NULL */
for (i = 0, tocp = toc_text; i < doc->numpages;
i++, tocp += toc_entry_length) {
@@ -1054,7 +1053,7 @@ setup_ghostview()
String s;
int i=0;
if (toc_text) {
- s = (char*)GV_XtMalloc((doc->numpages+1)*sizeof(char));
+ s = (char*)XtMalloc((doc->numpages+1)*sizeof(char));
while (i < (int)doc->numpages) {
s[i] = 'p';
i++;
@@ -1077,7 +1076,7 @@ setup_ghostview()
XawScrollbarSetThumb(newtocScroll,
VlistScrollPosition(newtoc),
VlistVisibleLength(newtoc,newtocClip->core.height));
- GV_XtFree(s);
+ XtFree(s);
}
misc_setBitmap(w_toggleCurrentPage , show_toggleCurrentPage ,
app_res.mark_current_bitmap);
@@ -1641,8 +1640,8 @@ void misc_buildPagemediaMenu()
if (doc) num_doc_media = doc->nummedia;
i = gv_num_std_pagemedia + num_doc_media;
- if (pagemediaEntry) GV_XtFree(pagemediaEntry);
- pagemediaEntry = (Widget *) GV_XtMalloc(i * sizeof(Widget));
+ XtFree((XtPointer)pagemediaEntry);
+ pagemediaEntry = (Widget *) XtMalloc(i * sizeof(Widget));
if (doc && doc->nummedia) {
for (i = 0; i < doc->nummedia; i++) {
@@ -1734,7 +1733,7 @@ quote_filename (string)
BEGINMESSAGE(quote_filename)
- result = (char*) GV_XtMalloc((2 * strlen (string) + 1) * sizeof(char));
+ result = (char*) XtMalloc((2 * strlen (string) + 1) * sizeof(char));
for (r = result, s = string; s && (c = *s); s++)
{
diff --git a/gv/src/miscmenu.c b/gv/src/miscmenu.c
index 6ab9847..e0da48b 100644
--- a/gv/src/miscmenu.c
+++ b/gv/src/miscmenu.c
@@ -54,7 +54,6 @@
#include "callbacks.h"
#include "miscmenu.h"
#include "options.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
@@ -86,10 +85,10 @@ void miscmenu_freeMiscMenuEntries(entries)
int i=0;
BEGINMESSAGE(miscmenu_freeMiscMenuEntries)
while (entries[i]) {
- GV_XtFree(entries[i]);
+ XtFree((XtPointer)entries[i]);
i++;
}
- if (entries) GV_XtFree(entries);
+ XtFree((XtPointer)entries);
ENDMESSAGE(miscmenu_freeMiscMenuEntries)
}
@@ -100,7 +99,7 @@ void miscmenu_freeMiscMenuEntries(entries)
static MiscMenuEntry miscmenu_mallocMiscMenuEntry(void)
{
MiscMenuEntry entry;
- entry = (MiscMenuEntry) GV_XtMalloc(sizeof(MiscMenuEntryStruct));
+ entry = (MiscMenuEntry) XtMalloc(sizeof(MiscMenuEntryStruct));
memset((void*)entry ,0,sizeof(MiscMenuEntryStruct));
return entry;
}
@@ -118,7 +117,7 @@ MiscMenuEntry *miscmenu_parseMiscMenuEntries(s)
s =options_squeezeMultiline(s);
for (n=1,c=s; (c = strchr(c,'\n')); n++, c++);
INFIMESSAGE(number of entries,n)
- mentries = entries = (MiscMenuEntry*)
GV_XtMalloc((n+2)*sizeof(MiscMenuEntry));
+ mentries = entries = (MiscMenuEntry*) XtMalloc((n+2)*sizeof(MiscMenuEntry));
c=s;
if (*s) while (n>0) {
nl = strchr(c,'\n');
@@ -144,7 +143,7 @@ MiscMenuEntry *miscmenu_parseMiscMenuEntries(s)
*entries++ = entry;
}
*entries = (MiscMenuEntry) NULL;
- GV_XtFree(s);
+ XtFree(s);
ENDMESSAGE(miscmenu_parseMiscMenuEntries)
return(mentries);
}
diff --git a/gv/src/options.c b/gv/src/options.c
index c5b500c..4f8bdab 100644
--- a/gv/src/options.c
+++ b/gv/src/options.c
@@ -53,7 +53,6 @@
#include "MButton.h"
#include "types.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
#include "file.h"
@@ -141,10 +140,10 @@ void options_textApply(w,bP,sP)
Boolean *bP;
String *sP;
{
- if (!bP || (bP && *bP==True)) GV_XtFree(*sP);
+ if (!bP || (bP && *bP==True)) XtFree(*sP);
if (bP) *bP=True;
*sP = widgets_getText(w);
- *sP = GV_XtNewString(*sP);
+ *sP = XtNewString(*sP);
}
/*######################################################
@@ -228,7 +227,7 @@ String options_squeezeMultiline(s)
BEGINMESSAGE(options_squeezeMultiline)
if (!s) s = "";
- md = s = d = GV_XtNewString(s);
+ md = s = d = XtNewString(s);
while (*d) {
while (isspace(*d)) d++;
b=e=d;
@@ -254,7 +253,7 @@ String options_squeeze(s)
BEGINMESSAGE(options_squeeze)
if (!s) s = "";
- md = s = d = GV_XtNewString(s);
+ md = s = d = XtNewString(s);
while (isspace(*d)) d++;
while (*d) {
if (!isspace(*d) || !isspace(*(d+1))) {
@@ -287,7 +286,7 @@ static char* options_readline(infile,lineP)
BEGINMESSAGE(options_readline)
while (fgets(tmp,MAX_RECORD_LENGTH,infile)) {
multi = *lineP ? strlen(*lineP) : 0;
- *lineP = GV_XtRealloc(*lineP,(multi+strlen(tmp)+1)*sizeof(char));
+ *lineP = XtRealloc(*lineP,(multi+strlen(tmp)+1)*sizeof(char));
if (!multi) (*lineP)[0] = '\0';
strcat(*lineP,tmp);
multi=0; esc = strrchr(tmp,'\\');
@@ -315,7 +314,7 @@ static void options_writeline(outfile,header,value)
BEGINMESSAGE(options_writeline)
while ((nl=strchr(nl,'\n'))) { nl++; num_nl++; }
- header = GV_XtNewString(header);
+ header = XtNewString(header);
s = strrchr(header,':');
i=0;
if (s) {
@@ -328,7 +327,7 @@ static void options_writeline(outfile,header,value)
}
}
if (i==strlen(header)) i=24;
- line = GV_XtMalloc((strlen(header) + strlen(value) + num_nl*3 + i +
2)*sizeof(char));
+ line = XtMalloc((strlen(header) + strlen(value) + num_nl*3 + i +
2)*sizeof(char));
line[0]='\0';
strcpy(line,header);
while (num_nl>=0) {
@@ -358,8 +357,8 @@ static void options_writeline(outfile,header,value)
value=nl;
line[0]='\0';
}
- GV_XtFree(line);
- GV_XtFree(header);
+ XtFree(line);
+ XtFree(header);
ENDMESSAGE(options_writeline)
}
@@ -404,7 +403,7 @@ void options_save(argn,argi,argv)
NotePopupShowMessage(errorMessage);
INFMESSAGE(cannot create temporary file)
fclose(infile);
- GV_XtFree(tempfilename);
+ XtFree(tempfilename);
ENDMESSAGE(options_save)
return;
}
@@ -436,7 +435,7 @@ void options_save(argn,argi,argv)
else ++i;
}
if (!j) fputs(line,tempfile);
- GV_XtFree(line);
+ XtFree(line);
line=NULL;
}
fclose(infile);
@@ -452,12 +451,12 @@ void options_save(argn,argi,argv)
sprintf(errorMessage,"Save aborted: \nCannot rename temporary '%s'\n to
'%s'",tempfilename,gv_user_defaults_file);
NotePopupShowMessage(errorMessage);
unlink(tempfilename);
- GV_XtFree(tempfilename);
+ XtFree(tempfilename);
INFMESSAGE(cannot rename temporary file)
ENDMESSAGE(options_save)
return;
}
- GV_XtFree(tempfilename);
+ XtFree(tempfilename);
ENDMESSAGE(options_save)
}
diff --git a/gv/src/options_fs.c b/gv/src/options_fs.c
index dc491aa..4f3ff3c 100644
--- a/gv/src/options_fs.c
+++ b/gv/src/options_fs.c
@@ -53,7 +53,6 @@
#include "types.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "widgets_misc.h"
#include "main_resources.h"
#include "main_globals.h"
@@ -96,9 +95,9 @@ static void options_fs_setOptionsAtEntry(void)
SMESSAGE(app_res.default_save_dir)
widgets_setText(default_save_dir, app_res.default_save_dir);
SMESSAGE(gv_filters)
- s = options_squeezeMultiline(gv_filters); widgets_setText(filters,s);
GV_XtFree(s);
+ s = options_squeezeMultiline(gv_filters); widgets_setText(filters,s);
XtFree(s);
SMESSAGE(gv_dirs)
- s = options_squeezeMultiline(gv_dirs); widgets_setText(dirs,s); GV_XtFree(s);
+ s = options_squeezeMultiline(gv_dirs); widgets_setText(dirs,s); XtFree(s);
SMESSAGE(gv_filter)
widgets_setText(filter,gv_filter);
ENDMESSAGE(options_fs_setOptionsAtEntry)
@@ -164,8 +163,8 @@ void options_fs_cb_save(w, client_data, call_data)
options_save(argn,argi,argv);
while (--argn >=0) {
- GV_XtFree(argi[argn]);
- GV_XtFree(argv[argn]);
+ XtFree(argi[argn]);
+ XtFree(argv[argn]);
}
ENDMESSAGE(options_fs_cb_save)
diff --git a/gv/src/options_gs.c b/gv/src/options_gs.c
index 499c242..485b83f 100644
--- a/gv/src/options_gs.c
+++ b/gv/src/options_gs.c
@@ -59,7 +59,6 @@
#include "types.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "file.h"
#include "widgets_misc.h"
#include "main_resources.h"
@@ -141,7 +140,7 @@ static Boolean options_gs_change (w,sP,fP)
*fP = *sP;
*sP = v;
r = True;
- } else GV_XtFree(v);
+ } else XtFree(v);
ENDMESSAGE(options_gs_change)
return(r);
}
@@ -194,7 +193,7 @@ static void options_gs_cb_apply(w, client_data, call_data)
XtSetValues(page, args, n);
if (gv_filename) show_page(REQUEST_REOPEN,NULL);
}
- for (i=0; i<6 ; i++) if (f[i]) GV_XtFree(f[i]);
+ for (i=0; i<6 ; i++) XtFree(f[i]);
ENDMESSAGE(options_gs_cb_apply)
}
@@ -216,7 +215,7 @@ static void
options_gs_setArg(w,argiP,argvP,argnP,format,name)
s = options_squeeze(s);
options_setArg(argiP,argvP,format,name,s);
++(*argnP);
- GV_XtFree(s);
+ XtFree(s);
}
static
@@ -250,8 +249,8 @@ void options_gs_cb_save(w, client_data, call_data)
options_save(argn,argi,argv);
while (--argn >=0) {
- GV_XtFree(argi[argn]);
- GV_XtFree(argv[argn]);
+ XtFree(argi[argn]);
+ XtFree(argv[argn]);
}
ENDMESSAGE(options_gv_cb_save)
diff --git a/gv/src/options_gv.c b/gv/src/options_gv.c
index dd436ed..a095a76 100644
--- a/gv/src/options_gv.c
+++ b/gv/src/options_gv.c
@@ -61,7 +61,6 @@
#include "types.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "file.h"
#include "widgets_misc.h"
#include "main_resources.h"
@@ -267,11 +266,11 @@ static void options_gv_cb_apply(w, client_data, call_data)
reopen=True;
}
- if (s_media) GV_XtFree(app_res.default_pagemedia);
+ if (s_media) XtFree(app_res.default_pagemedia);
n=0;
XtSetArg(args[n], XtNlabel, &app_res.default_pagemedia);n++;
XtGetValues(mediaButton, args, n);
- app_res.default_pagemedia = GV_XtNewString(app_res.default_pagemedia);
+ app_res.default_pagemedia = XtNewString(app_res.default_pagemedia);
i = doc_convStringToPageMedia(NULL,app_res.default_pagemedia);
if (i != opt_pagemedia) {
INFMESSAGE(pagemedia changed)
@@ -285,24 +284,24 @@ static void options_gv_cb_apply(w, client_data, call_data)
}
s_media = True;
- if (s_fmedia) GV_XtFree(app_res.fallback_pagemedia);
+ if (s_fmedia) XtFree(app_res.fallback_pagemedia);
n=0;
XtSetArg(args[n], XtNlabel, &app_res.fallback_pagemedia);n++;
XtGetValues(fmediaButton, args, n);
- app_res.fallback_pagemedia = GV_XtNewString(app_res.fallback_pagemedia);
+ app_res.fallback_pagemedia = XtNewString(app_res.fallback_pagemedia);
gv_fallback_pagemedia =
doc_convStringToPageMedia(NULL,app_res.fallback_pagemedia);
s_fmedia = True;
- if (s_orient) GV_XtFree(app_res.default_orientation);
+ if (s_orient) XtFree(app_res.default_orientation);
n=0;
XtSetArg(args[n], XtNlabel, &v);n++;
XtGetValues(orientButton, args, n);
- if (!strcmp(v, automaticLabel)) app_res.default_orientation =
GV_XtNewString("Automatic");
- else if (!strcmp(v, orientations[0])) app_res.default_orientation =
GV_XtNewString(orientationsExtern[0]);
- else if (!strcmp(v, orientations[1])) app_res.default_orientation =
GV_XtNewString(orientationsExtern[1]);
- else if (!strcmp(v, orientations[2])) app_res.default_orientation =
GV_XtNewString(orientationsExtern[2]);
- else if (!strcmp(v, orientations[3])) app_res.default_orientation =
GV_XtNewString(orientationsExtern[3]);
+ if (!strcmp(v, automaticLabel)) app_res.default_orientation =
XtNewString("Automatic");
+ else if (!strcmp(v, orientations[0])) app_res.default_orientation =
XtNewString(orientationsExtern[0]);
+ else if (!strcmp(v, orientations[1])) app_res.default_orientation =
XtNewString(orientationsExtern[1]);
+ else if (!strcmp(v, orientations[2])) app_res.default_orientation =
XtNewString(orientationsExtern[2]);
+ else if (!strcmp(v, orientations[3])) app_res.default_orientation =
XtNewString(orientationsExtern[3]);
i = doc_convStringToDocOrient(app_res.default_orientation);
if (i != opt_orientation) {
@@ -316,15 +315,15 @@ static void options_gv_cb_apply(w, client_data, call_data)
}
s_orient = True;
- if (s_forient) GV_XtFree(app_res.fallback_orientation);
+ if (s_forient) XtFree(app_res.fallback_orientation);
n=0;
XtSetArg(args[n], XtNlabel, &v);n++;
XtGetValues(forientButton, args, n);
- if (!strcmp(v, orientations[0])) app_res.fallback_orientation =
GV_XtNewString(orientationsExtern[0]);
- else if (!strcmp(v, orientations[1])) app_res.fallback_orientation =
GV_XtNewString(orientationsExtern[1]);
- else if (!strcmp(v, orientations[2])) app_res.fallback_orientation =
GV_XtNewString(orientationsExtern[2]);
- else if (!strcmp(v, orientations[3])) app_res.fallback_orientation =
GV_XtNewString(orientationsExtern[3]);
+ if (!strcmp(v, orientations[0])) app_res.fallback_orientation =
XtNewString(orientationsExtern[0]);
+ else if (!strcmp(v, orientations[1])) app_res.fallback_orientation =
XtNewString(orientationsExtern[1]);
+ else if (!strcmp(v, orientations[2])) app_res.fallback_orientation =
XtNewString(orientationsExtern[2]);
+ else if (!strcmp(v, orientations[3])) app_res.fallback_orientation =
XtNewString(orientationsExtern[3]);
gv_fallback_orientation =
doc_convStringToDocOrient(app_res.fallback_orientation);
s_forient = True;
@@ -457,8 +456,8 @@ void options_gv_cb_save(w, client_data, call_data)
options_save(argn,argi,argv);
while (--argn >=0) {
- GV_XtFree(argi[argn]);
- GV_XtFree(argv[argn]);
+ XtFree(argi[argn]);
+ XtFree(argv[argn]);
}
ENDMESSAGE(options_gv_cb_save)
diff --git a/gv/src/options_setup.c b/gv/src/options_setup.c
index 7a912de..3d56dcd 100644
--- a/gv/src/options_setup.c
+++ b/gv/src/options_setup.c
@@ -61,7 +61,6 @@
#include "types.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "widgets_misc.h"
#include "magmenu.h"
#include "main_resources.h"
@@ -130,19 +129,19 @@ static void options_setup_setOptionsAtEntry(void)
SMESSAGE(gv_scales_res)
s = options_squeezeMultiline(gv_scales_res);
widgets_setText(scales,s);
- GV_XtFree(s);
+ XtFree(s);
SMESSAGE(gv_medias_res)
s = options_squeezeMultiline(gv_medias_res);
widgets_setText(medias,s);
- GV_XtFree(s);
+ XtFree(s);
SMESSAGE(gv_magmenu_entries_res)
s = options_squeezeMultiline(gv_magmenu_entries_res);
widgets_setText(magmenu,s);
- GV_XtFree(s);
+ XtFree(s);
SMESSAGE(gv_miscmenu_entries_res)
s = options_squeezeMultiline(gv_miscmenu_entries_res);
widgets_setText(miscmenu,s);
- GV_XtFree(s);
+ XtFree(s);
sprintf(tmp,"%d x %d",gv_screen_width,gv_screen_height);
widgets_setText(screenSize,tmp);
@@ -232,13 +231,13 @@ static void options_setup_cb_apply(w, client_data,
call_data)
sr = options_squeezeMultiline(gv_scales_res);
s = options_squeezeMultiline(l);
if (strcmp(s,sr)) {
- GV_XtFree(sr);
- GV_XtFree(gv_scales_res);
+ XtFree(sr);
+ XtFree(gv_scales_res);
gv_scales_res=s;
scale_freeScales(gv_scales);
gv_scales = scale_parseScales(gv_scales_res);
XtDestroyWidget(scaleMenu);
- GV_XtFree(scaleEntry);
+ XtFree((XtPointer)scaleEntry);
main_createScaleMenu();
gv_scale = scale_checkScaleNum(gv_scales,app_res.scale|SCALE_REL);
if (gv_scale < 0) gv_scale = scale_checkScaleNum(gv_scales,0|SCALE_REL);
@@ -252,8 +251,8 @@ static void options_setup_cb_apply(w, client_data,
call_data)
gv_scale_current = gv_scale_base_current = -1;
redisplay=True;
} else {
- GV_XtFree(s);
- GV_XtFree(sr);
+ XtFree(s);
+ XtFree(sr);
}
}
@@ -263,8 +262,8 @@ static void options_setup_cb_apply(w, client_data,
call_data)
sr = options_squeezeMultiline(gv_medias_res);
s = options_squeezeMultiline(l);
if (strcmp(s,sr)) {
- GV_XtFree(sr);
- GV_XtFree(gv_medias_res);
+ XtFree(sr);
+ XtFree(gv_medias_res);
gv_medias_res=s;
media_freeMedias(gv_medias);
gv_medias = media_parseMedias(gv_medias_res);
@@ -285,8 +284,8 @@ static void options_setup_cb_apply(w, client_data,
call_data)
options_gv_createMediaMenus();
redisplay=True;
} else {
- GV_XtFree(s);
- GV_XtFree(sr);
+ XtFree(s);
+ XtFree(sr);
}
}
@@ -373,8 +372,8 @@ void options_setup_cb_save(w, client_data, call_data)
options_save(argn,argi,argv);
while (--argn >=0) {
- GV_XtFree(argi[argn]);
- GV_XtFree(argv[argn]);
+ XtFree(argi[argn]);
+ XtFree(argv[argn]);
}
ENDMESSAGE(options_setup_cb_save)
diff --git a/gv/src/process.c b/gv/src/process.c
index 3301eb8..d5db2a1 100644
--- a/gv/src/process.c
+++ b/gv/src/process.c
@@ -59,7 +59,6 @@
#include "types.h"
#include "config.h"
#include "callbacks.h"
-#include "d_memdebug.h"
#include "process.h"
#include "main_resources.h"
#include "main_globals.h"
@@ -97,7 +96,7 @@ static ProcessData process_get_pd(void)
# ifdef MESSAGES
if (!gpd) { INFMESSAGE(no processes registered yet) }
# endif
- pd = (ProcessData) PROC_XtMalloc(size);
+ pd = (ProcessData) XtMalloc(size);
memset((void*) pd ,0,(size_t)size);
if (!gpd) gpd = pd;
else {
@@ -125,8 +124,8 @@ static void process_remove_pd(pd)
}
process_menu(pd,PROCESS_MENU_DEL_ENTRY);
DESTROY_TIMER(pd->timer)
- PROC_XtFree(pd->name);
- PROC_XtFree(pd);
+ XtFree(pd->name);
+ XtFree((XtPointer)pd);
# ifdef MESSAGES
if (!gpd) { INFMESSAGE(no more processes registered) }
# endif
@@ -289,7 +288,7 @@ ProcessData process_fork (name,command,notify_proc,data)
}
}
INFMESSAGE(parent process)
- pd->name = PROC_XtNewString(name);
+ pd->name = XtNewString(name);
pd->notify_proc = notify_proc;
pd->data = data;
pd->pid = pid;
@@ -357,7 +356,7 @@ void process_menu(pd,action)
n=0;
XtSetArg(args[n], XtNlabel, &label); n++;
XtGetValues(processButton,args,n);
- label=PROC_XtNewString(label);
+ label=XtNewString(label);
SMESSAGE(label)
n=0;
@@ -371,7 +370,7 @@ void process_menu(pd,action)
n=0;
XtSetArg(args[n], XtNresize, False); n++;
XtSetValues(processButton,args,n);
- PROC_XtFree(label);
+ XtFree(label);
process_set_shell_resize(allow_resize);
visible=1;
@@ -422,7 +421,7 @@ void process_menu(pd,action)
XtSetArg(args[n], XtNlabel, &label); n++;
XtGetValues(processButton,args,n);
len = strlen(label);
- tmp = (char*) PROC_XtMalloc(len*sizeof(char)+1);
+ tmp = (char*) XtMalloc(len*sizeof(char)+1);
strcpy(tmp,&(label[progress]));
if (progress) {
if (progress>(int)len) progress=(int)len;
@@ -432,7 +431,7 @@ void process_menu(pd,action)
progress++;
if (progress==(int)len+1) progress=0;
update_label(processButton,tmp);
- PROC_XtFree(tmp);
+ XtFree(tmp);
}
}
}
diff --git a/gv/src/ps.c b/gv/src/ps.c
index cb9e6e4..5f8c62f 100644
--- a/gv/src/ps.c
+++ b/gv/src/ps.c
@@ -98,7 +98,6 @@
#include "ps.h"
#include "note.h"
#include "actions.h"
-#include "d_memdebug.h"
extern Media *gv_medias;
extern String gv_pdf_password;
extern String gv_safe_gs_workdir;
@@ -123,14 +122,14 @@ static int dsc_strncmp(s1, s2, n)
if (strncasecmp(s1, s2, n) == 0)
return 0;
if (s2[n-1] == ':'){
- tmp = (char *) PS_malloc(n*sizeof(char));
+ tmp = (char *) malloc(n*sizeof(char));
strncpy(tmp, s2, (n-1));
tmp[n-1]=' ';
if (strncasecmp(s1, tmp, n) == 0){
- PS_free(tmp);
+ free(tmp);
return 0;
}
- PS_free(tmp);
+ free(tmp);
}
return 1;
@@ -430,8 +429,8 @@
psscan(fileP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_
} else {
sprintf(cmd, "gzip -dc %s >%s", quoted_filename, quoted_filename_unc);
}
- GV_XtFree(quoted_filename);
- GV_XtFree(quoted_filename_unc);
+ XtFree(quoted_filename);
+ XtFree(quoted_filename_unc);
INFMESSAGE(is compressed)
@@ -447,7 +446,7 @@ unc_failed:
if (tempfile) fclose(tempfile);
unlink(filename_unc);
unc_ok:
- GV_XtFree(filename_unc);
+ XtFree(filename_unc);
ENDMESSAGE(psscan)
return(retval);
}
@@ -463,7 +462,7 @@ unc_ok:
goto unc_failed;
}
#endif
- *filename_uncP = (char*)GV_XtNewString(filename_unc);
+ *filename_uncP = (char*)XtNewString(filename_unc);
goto unc_ok;
}
#else
@@ -507,7 +506,7 @@ unc_ok:
if (line_len>1 && (iscomment(line,"%!PS-Adobe-") || iscomment(line +
1,"%!PS-Adobe-"))) {
INFMESSAGE(found "PS-Adobe-" comment)
- doc = (struct document *) PS_malloc(sizeof(struct document));
+ doc = (struct document *) malloc(sizeof(struct document));
CHECK_MALLOCED(doc);
memset(doc, 0, sizeof(struct document));
*text=0;
@@ -566,14 +565,14 @@ unc_ok:
strcpy(parameter, " -sPDFPassword=");
password = quote_filename(gv_pdf_password);
strcat(parameter, password);
- GV_XtFree(password);
+ XtFree(password);
sprintf(cmd,cmd_scan_pdf,quoted_filename,quoted_filename_dsc,
parameter);
}
else
sprintf(cmd,cmd_scan_pdf,quoted_filename,quoted_filename_dsc, "");
}
- GV_XtFree(quoted_filename);
- GV_XtFree(quoted_filename_dsc);
+ XtFree(quoted_filename);
+ XtFree(quoted_filename_dsc);
old_umask = umask(0077);
INFMESSAGE(is PDF)
@@ -627,7 +626,7 @@ unc_ok:
goto scan_password_required;
/* TODO? but wait for password dialog */
}
- GV_XtFree(tmp_filename);
+ XtFree(tmp_filename);
scan_exec_failed:
sprintf(s,"Execution of\n%s\nfailed.",cmd);
@@ -637,7 +636,7 @@ scan_password_required:
if (tempfile) fclose(tempfile);
unlink(filename_dsc);
scan_ok:
- GV_XtFree(filename_dsc);
+ XtFree(filename_dsc);
ps_io_exit(fd);
ENDMESSAGE(psscan)
return(retval);
@@ -649,7 +648,7 @@ scan_ok:
close(tmp_fd);
unlink((char*) tmp_filename);
- GV_XtFree(tmp_filename);
+ XtFree(tmp_filename);
umask (old_umask);
tempfile = fopen(filename_dsc, "r");
@@ -661,7 +660,7 @@ scan_ok:
sprintf(s,"Scanning\n%s\nfailed.",filename_dsc);
goto scan_failed;
}
- *filename_dscP = (char*)GV_XtNewString(filename_dsc);
+ *filename_dscP = (char*)XtNewString(filename_dsc);
goto scan_ok;
} else {
INFMESSAGE(unable to classify document)
@@ -764,7 +763,7 @@ scan_ok:
}
case 1:
if (maxpages > 0) {
- doc->pages = (struct page *) PS_calloc(maxpages,
+ doc->pages = (struct page *) calloc(maxpages,
sizeof(struct page));
CHECK_MALLOCED(doc->pages);
}
@@ -774,7 +773,7 @@ scan_ok:
iscomment(line+2, "DocumentMedia:")) {
float w, h;
doc->media = (Media)
- PS_malloc(sizeof (MediaStruct));
+ malloc(sizeof (MediaStruct));
CHECK_MALLOCED(doc->media);
doc->media[0].name = ps_gettext(line+length("%%DocumentMedia:"),
&next_char);
@@ -786,14 +785,14 @@ scan_ok:
if (doc->media[0].width != 0 && doc->media[0].height != 0)
doc->nummedia = 1;
else
- PS_free(doc->media[0].name);
+ free(doc->media[0].name);
}
preread=1;
while (readline(fd, &line, &position, &line_len) &&
DSCcomment(line) && iscomment(line+2, "+")) {
section_len += line_len;
doc->media = (Media)
- PS_realloc(doc->media,
+ realloc(doc->media,
(doc->nummedia+1)*
sizeof (MediaStruct));
CHECK_MALLOCED(doc->media);
@@ -807,7 +806,7 @@ scan_ok:
if (doc->media[doc->nummedia].width != 0 &&
doc->media[doc->nummedia].height != 0) doc->nummedia++;
else
- PS_free(doc->media[doc->nummedia].name);
+ free(doc->media[doc->nummedia].name);
}
}
section_len += line_len;
@@ -816,7 +815,7 @@ scan_ok:
iscomment(line+2, "DocumentPaperSizes:")) {
doc->media = (Media)
- PS_malloc(sizeof (MediaStruct));
+ malloc(sizeof (MediaStruct));
CHECK_MALLOCED(doc->media);
doc->media[0].name =
ps_gettext(line+length("%%DocumentPaperSizes:"),
&next_char);
@@ -830,8 +829,8 @@ scan_ok:
* PaperSize comments.
*/
if (strcasecmp(doc->media[0].name, dmp->name) == 0) {
- PS_free(doc->media[0].name);
- doc->media[0].name = (char
*)PS_malloc(strlen(dmp->name)+1);
+ free(doc->media[0].name);
+ doc->media[0].name = (char
*)malloc(strlen(dmp->name)+1);
CHECK_MALLOCED(doc->media[0].name);
strcpy(doc->media[0].name, dmp->name);
doc->media[0].width = dmp->width;
@@ -842,11 +841,11 @@ scan_ok:
if (doc->media[0].width != 0 && doc->media[0].height != 0)
doc->nummedia = 1;
else
- PS_free(doc->media[0].name);
+ free(doc->media[0].name);
}
while ((cp = ps_gettext(next_char, &next_char))) {
doc->media = (Media)
- PS_realloc(doc->media,
+ realloc(doc->media,
(doc->nummedia+1)*
sizeof (MediaStruct));
CHECK_MALLOCED(doc->media);
@@ -861,9 +860,9 @@ scan_ok:
*/
if (strcasecmp(doc->media[doc->nummedia].name,
dmp->name) == 0) {
- PS_free(doc->media[doc->nummedia].name);
+ free(doc->media[doc->nummedia].name);
doc->media[doc->nummedia].name =
- (char *)PS_malloc(strlen(dmp->name)+1);
+ (char *)malloc(strlen(dmp->name)+1);
CHECK_MALLOCED(doc->media[doc->nummedia].name);
strcpy(doc->media[doc->nummedia].name, dmp->name);
doc->media[doc->nummedia].width = dmp->width;
@@ -874,7 +873,7 @@ scan_ok:
if (doc->media[doc->nummedia].width != 0 &&
doc->media[doc->nummedia].height != 0) doc->nummedia++;
else
- PS_free(doc->media[doc->nummedia].name);
+ free(doc->media[doc->nummedia].name);
}
preread=1;
while (readline(fd, &line, &position, &line_len) &&
@@ -883,7 +882,7 @@ scan_ok:
next_char = line + length("%%+");
while ((cp = ps_gettext(next_char, &next_char))) {
doc->media = (Media)
- PS_realloc(doc->media,
+ realloc(doc->media,
(doc->nummedia+1)*
sizeof (MediaStruct));
CHECK_MALLOCED(doc->media);
@@ -906,7 +905,7 @@ scan_ok:
if (doc->media[doc->nummedia].width != 0 &&
doc->media[doc->nummedia].height != 0) doc->nummedia++;
else
- PS_free(doc->media[doc->nummedia].name);
+ free(doc->media[doc->nummedia].name);
}
}
section_len += line_len;
@@ -979,7 +978,7 @@ scan_ok:
break;
}
}
- PS_free(cp);
+ free(cp);
} else if (page_bb_set == NONE &&
iscomment(line+2, "PageBoundingBox:")) {
if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
@@ -1105,7 +1104,7 @@ scan_ok:
break;
}
}
- PS_free(cp);
+ free(cp);
} else if (page_bb_set == NONE &&
iscomment(line+2, "PageBoundingBox:")) {
if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
@@ -1180,7 +1179,7 @@ newpage:
while (DSCcomment(line) && iscomment(line+2, "Page:")) {
if (maxpages == 0) {
maxpages = 1;
- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct
page));
+ doc->pages = (struct page *) calloc(maxpages, sizeof(struct page));
CHECK_MALLOCED(doc->pages);
}
label = ps_gettext(line+length("%%Page:"), &next_char);
@@ -1189,7 +1188,7 @@ newpage:
ignore = thispage != 1;
}
if (!ignore && thispage != nextpage) {
- PS_free(label);
+ free(label);
doc->numpages--;
goto continuepage;
}
@@ -1197,7 +1196,7 @@ newpage:
if (doc->numpages == maxpages) {
maxpages++;
doc->pages = (struct page *)
- PS_realloc(doc->pages, maxpages*sizeof (struct page));
+ realloc(doc->pages, maxpages*sizeof (struct page));
CHECK_MALLOCED(doc->pages);
}
@@ -1237,7 +1236,7 @@ continuepage:
break;
}
}
- PS_free(cp);
+ free(cp);
} else if (doc->pages[doc->numpages].media == NULL &&
iscomment(line+2, "PaperSize:")) {
cp = ps_gettext(line+length("%%PaperSize:"), NULL);
@@ -1251,7 +1250,7 @@ continuepage:
break;
}
}
- PS_free(cp);
+ free(cp);
} else if ((page_bb_set == NONE || page_bb_set == ATEND) &&
iscomment(line+2, "PageBoundingBox:")) {
sec_sscanf(line+length("%%PageBoundingBox:"), "%256s", text);
@@ -1318,7 +1317,7 @@ continuepage:
if (!DSCcomment(line)) {
/* Do nothing */
} else if (iscomment(line+2, "Page:")) {
- PS_free(ps_gettext(line+length("%%Page:"), &next_char));
+ free(ps_gettext(line+length("%%Page:"), &next_char));
if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
if (!ignore && thispage == nextpage) {
if (doc->numpages > 0) {
@@ -1411,7 +1410,7 @@ continuepage:
if (!preread) section_len += line_len;
preread = 0;
if (DSCcomment(line) && iscomment(line+2, "Page:")) {
- PS_free(ps_gettext(line+length("%%Page:"), &next_char));
+ free(ps_gettext(line+length("%%Page:"), &next_char));
if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
if (!ignore && thispage == nextpage) {
if (doc->numpages > 0) {
@@ -1454,16 +1453,16 @@ psfree(doc)
BEGINMESSAGE(psfree)
if (doc) {
for (i=0; i<doc->numpages; i++) {
- if (doc->pages[i].label) PS_free(doc->pages[i].label);
+ if (doc->pages[i].label) free(doc->pages[i].label);
}
for (i=0; i<doc->nummedia; i++) {
- if (doc->media[i].name) PS_free(doc->media[i].name);
+ if (doc->media[i].name) free(doc->media[i].name);
}
- if (doc->title) PS_free(doc->title);
- if (doc->date) PS_free(doc->date);
- if (doc->pages) PS_free(doc->pages);
- if (doc->media) PS_free(doc->media);
- PS_free(doc);
+ if (doc->title) free(doc->title);
+ if (doc->date) free(doc->date);
+ if (doc->pages) free(doc->pages);
+ if (doc->media) free(doc->media);
+ free(doc);
}
ENDMESSAGE(psfree)
}
@@ -1489,7 +1488,7 @@ gettextline(line)
return ps_gettext(line, NULL);
} else {
if (strlen(line) == 0) {ENDMESSAGE(gettextline) return NULL;}
- cp = (char *) PS_malloc(strlen(line));
+ cp = (char *) malloc(strlen(line));
CHECK_MALLOCED(cp);
strncpy(cp, line, strlen(line)-1);
cp[strlen(line)-1] = '\0';
@@ -1592,7 +1591,7 @@ ps_gettext(line, next_char)
*cp = '\0';
if (next_char) *next_char = line;
if (!quoted && strlen(text) == 0) {ENDMESSAGE(ps_gettext) return NULL;}
- cp = (char *) PS_malloc(strlen(text)+1);
+ cp = (char *) malloc(strlen(text)+1);
CHECK_MALLOCED(cp);
strcpy(cp, text);
ENDMESSAGE(ps_gettext)
@@ -1631,7 +1630,7 @@ static FileData ps_io_init(file)
BEGINMESSAGE(ps_io_init)
- fd = (FileData) PS_XtMalloc(size);
+ fd = (FileData) XtMalloc(size);
memset((void*) fd ,0,(size_t)size);
rewind(file);
@@ -1639,7 +1638,7 @@ static FileData ps_io_init(file)
FD_FILE_DESC = fileno(file);
FD_FILEPOS = GV_FTELL(file);
FD_BUF_SIZE = (2*LINE_CHUNK_SIZE)+1;
- FD_BUF = PS_XtMalloc(FD_BUF_SIZE);
+ FD_BUF = XtMalloc(FD_BUF_SIZE);
FD_BUF[0] = '\0';
ENDMESSAGE(ps_io_init)
return(fd);
@@ -1654,8 +1653,8 @@ ps_io_exit(fd)
FileData fd;
{
BEGINMESSAGE(ps_io_exit)
- PS_XtFree(FD_BUF);
- PS_XtFree(fd);
+ XtFree(FD_BUF);
+ XtFree((XtPointer)fd);
ENDMESSAGE(ps_io_exit)
}
@@ -1781,7 +1780,7 @@ static char * ps_io_fgetchars(fd,num)
*/
FD_BUF_SIZE = FD_BUF_SIZE+LINE_CHUNK_SIZE+1;
IMESSAGE(FD_BUF_SIZE)
- FD_BUF = PS_XtRealloc(FD_BUF,FD_BUF_SIZE);
+ FD_BUF = XtRealloc(FD_BUF,FD_BUF_SIZE);
}
}
@@ -2017,7 +2016,7 @@ pscopyuntil(fd, to, begin, end, comment)
line = ps_io_fgetchars(fd,-1);
if (!line) break;
if (comment && strncmp(line, comment, comment_length) == 0) {
- char *cp = (char *) PS_malloc(strlen(line)+1);
+ char *cp = (char *) malloc(strlen(line)+1);
INFSMESSAGE(encountered specified,comment)
CHECK_MALLOCED(cp);
strcpy(cp, line);
@@ -2126,7 +2125,7 @@ pscopydoc(dest_file,src_filename,d,pagelist)
SMESSAGE(comment)
here = ps_io_ftell(fd);
if (pages_written || pages_atend) {
- PS_free(comment);
+ free(comment);
continue;
}
sec_sscanf(comment+length("%%Pages:"), "%256s", text);
@@ -2144,7 +2143,7 @@ pscopydoc(dest_file,src_filename,d,pagelist)
}
pages_written = True;
}
- PS_free(comment);
+ free(comment);
}
pscopyuntil(fd, dest_file, d->beginpreview, d->endpreview,NULL);
pscopyuntil(fd, dest_file, d->begindefaults, d->enddefaults,NULL);
@@ -2157,7 +2156,7 @@ pscopydoc(dest_file,src_filename,d,pagelist)
if (pagelist[j]=='*') {
comment =
pscopyuntil(fd,dest_file,d->pages[i].begin,d->pages[i].end, "%%Page:");
fprintf(dest_file, "%%%%Page: %s %d\n",d->pages[i].label, page++);
- PS_free(comment);
+ free(comment);
pscopyuntil(fd, dest_file, -1, d->pages[i].end,NULL);
}
}
@@ -2166,7 +2165,7 @@ pscopydoc(dest_file,src_filename,d,pagelist)
while ((comment = pscopyuntil(fd, dest_file, here, d->endtrailer,
"%%Pages:"))) {
here = ps_io_ftell(fd);
if (pages_written) {
- PS_free(comment);
+ free(comment);
continue;
}
switch (sec_sscanf(comment+length("%%Pages:"), "%*d %d", &i)) {
@@ -2178,7 +2177,7 @@ pscopydoc(dest_file,src_filename,d,pagelist)
break;
}
pages_written = True;
- PS_free(comment);
+ free(comment);
}
fclose(src_file);
ps_io_exit(fd);
diff --git a/gv/src/resource.c b/gv/src/resource.c
index c98ef4f..c50e83a 100644
--- a/gv/src/resource.c
+++ b/gv/src/resource.c
@@ -49,7 +49,6 @@
#include "types.h"
#include "config.h"
-#include "d_memdebug.h"
#include "file.h"
#include "main_resources.h"
#include "main_globals.h"
@@ -117,10 +116,10 @@ extern int debug_p;
void resource_freeData()
{
BEGINMESSAGE(resource_freeData)
- if (resource_system_file) GV_XtFree(resource_system_file);
- if (resource_user_file) GV_XtFree(resource_user_file);
- if (resource_style_file) GV_XtFree(resource_style_file);
- if (resource_ad_file) GV_XtFree(resource_ad_file);
+ XtFree(resource_system_file);
+ XtFree(resource_user_file);
+ XtFree(resource_style_file);
+ XtFree(resource_ad_file);
ENDMESSAGE(resource_freeData)
}
@@ -157,7 +156,7 @@ resource_buildDatabase (
/* ### system resources ################# */
INFMESSAGE(checking for system resources)
- rpath = GV_XtMalloc (strlen (GV_LIBDIR) + strlen ("/gv_system.ad") + 1);
+ rpath = XtMalloc (strlen (GV_LIBDIR) + strlen ("/gv_system.ad") + 1);
rpath[0] = '\0';
strcat (rpath, GV_LIBDIR);
strcat (rpath, "/gv_system.ad");
@@ -178,7 +177,7 @@ resource_buildDatabase (
strcpy(tmp,USER_DEFAULTS);
file_translateTildeInPath(tmp);
if (!file_fileIsNotUseful(tmp)) {
- s = GV_XtNewString(tmp);
+ s = XtNewString(tmp);
tildeGv = USER_DEFAULTS;
haveXUSERFILESEARCHPATH = 0;
} else {
@@ -194,7 +193,7 @@ resource_buildDatabase (
resource_user_file = s;
resource_user_file_symb = tildeGv;
} else {
- resource_user_file = GV_XtNewString(tmp);
+ resource_user_file = XtNewString(tmp);
}
/* ### Loading localisation ### */
@@ -468,22 +467,22 @@ resource_buildDatabase (
if (spartan_p)
{
char *spartan_filename = (char *)
- GV_XtMalloc (strlen(GV_LIBDIR) + strlen ("/gv_spartan.dat") + 1);
+ XtMalloc (strlen(GV_LIBDIR) + strlen ("/gv_spartan.dat") + 1);
spartan_filename[0] = '\0';
strcat(spartan_filename, GV_LIBDIR);
strcat(spartan_filename, "/gv_spartan.dat");
resource_putResource (&db, app_name, ".style", spartan_filename);
- GV_XtFree (spartan_filename);
+ XtFree (spartan_filename);
}
if (widgetless_p)
{
char *widgetless_filename = (char *)
- GV_XtMalloc (strlen(GV_LIBDIR) + strlen ("/gv_widgetless.dat") + 1);
+ XtMalloc (strlen(GV_LIBDIR) + strlen ("/gv_widgetless.dat") + 1);
widgetless_filename[0] = '\0';
strcat(widgetless_filename, GV_LIBDIR);
strcat(widgetless_filename, "/gv_widgetless.dat");
resource_putResource (&db, app_name, ".style", widgetless_filename);
- GV_XtFree (widgetless_filename);
+ XtFree (widgetless_filename);
}
if (quiet_p)
{
@@ -635,10 +634,10 @@ resource_buildDatabase (
} else s = t;
# endif
if (s) {
- s = GV_XtNewString(s);
+ s = XtNewString(s);
resource_style_file = s;
}
- if (t) GV_XtFree(t);
+ XtFree(t);
}
/* ### ad resources ######################## */
@@ -652,10 +651,10 @@ resource_buildDatabase (
s=NULL;
} else s = t;
if (s) {
- s = GV_XtNewString(s);
+ s = XtNewString(s);
resource_ad_file = s;
}
- if (t) GV_XtFree(t);
+ XtFree(t);
}
ENDMESSAGE(resource_buildDatabase)
@@ -851,7 +850,7 @@ char *resource_userDefaultsFile()
if (resource_ad_file) s = resource_ad_file;
else if (resource_user_file) s = resource_user_file;
else s = USER_DEFAULTS;
- s = GV_XtNewString(s);
+ s = XtNewString(s);
return(s);
ENDMESSAGE(resource_userResourceFile)
}
@@ -905,7 +904,7 @@ static char* resource_mergeFileIntoDatabase(dbP,name)
if (useful==1) {
INFSMESSAGE(merging,tmp)
XrmCombineFileDatabase(tmp,dbP,True);
- name = GV_XtNewString(tmp);
+ name = XtNewString(tmp);
}
else name=NULL;
ENDMESSAGE(resource_mergeFileIntoDatabase)
diff --git a/gv/src/save.c b/gv/src/save.c
index 1259da4..faaf48c 100644
--- a/gv/src/save.c
+++ b/gv/src/save.c
@@ -45,7 +45,6 @@
#include "types.h"
#include "config.h"
-#include "d_memdebug.h"
#include "error.h"
#include "file.h"
#include "main_resources.h"
@@ -73,7 +72,7 @@ save_allocSaveData()
Cardinal size = sizeof(SaveDataStruct);
BEGINMESSAGE(save_alllocSaveData)
- sd = (SaveData) GV_XtMalloc(size);
+ sd = (SaveData) XtMalloc(size);
memset((void*) sd ,0,(size_t)size);
ENDMESSAGE(save_allocSaveData)
return(sd);
@@ -88,12 +87,12 @@ save_freeSaveData(sd)
SaveData sd;
{
BEGINMESSAGE(save_freeSaveData)
- if (sd->save_fn) GV_XtFree(sd->save_fn);
- if (sd->src_fn) GV_XtFree(sd->src_fn);
- if (sd->conv_fn) GV_XtFree(sd->conv_fn);
- if (sd->pagelist) GV_XtFree(sd->pagelist);
- if (sd->print_cmd) GV_XtFree(sd->print_cmd);
- if (sd) GV_XtFree(sd);
+ XtFree(sd->save_fn);
+ XtFree(sd->src_fn);
+ XtFree(sd->conv_fn);
+ XtFree(sd->pagelist);
+ XtFree(sd->print_cmd);
+ XtFree((XtPointer)sd);
ENDMESSAGE(save_freeSaveData)
}
@@ -120,12 +119,12 @@ print_file(print_command,print_filename)
BEGINMESSAGE(print_file)
print_quoted_filename = quote_filename(print_filename);
- p = GV_XtNewString(print_command);
+ p = XtNewString(print_command);
n=0;
c=p;
while ((c=strstr(c,"%s"))) { c+=2; n++; }
m = (strlen(p)+(n>0?n:1)*strlen(print_quoted_filename)+5)*sizeof(char);
- c = (char*) GV_XtMalloc(m);
+ c = (char*) XtMalloc(m);
if (n>0) {
char *e,*s;
e=s=p;
@@ -146,12 +145,12 @@ print_file(print_command,print_filename)
INFSMESSAGE(printing:,c)
if (SYSTEM_FAILED_ON(c)) {
m = (strlen(printfail)+strlen(c)+1)*sizeof(char);
- error = (char*) GV_XtMalloc(m);
+ error = (char*) XtMalloc(m);
sprintf(error,printfail,c);
}
- GV_XtFree(c);
- GV_XtFree(p);
- GV_XtFree(print_quoted_filename);
+ XtFree(c);
+ XtFree(p);
+ XtFree(print_quoted_filename);
ENDMESSAGE(print_file)
return(error);
}
@@ -175,7 +174,7 @@ save_forkPDFToPSConversionDone(client_data,type)
error = save_saveFile(sd);
if (error) {
NotePopupShowMessage(error);
- GV_XtFree(error);
+ XtFree(error);
}
} else if (type==PROCESS_KILL) {
INFMESSAGE(call is of type PROCESS_KILL)
@@ -235,8 +234,8 @@ save_forkPDFToPSConversion(sd)
} else {
sprintf(command,gv_gs_cmd_conv_pdf,quoted_conv_fn,quoted_src_fn);
}
- GV_XtFree(quoted_src_fn);
- GV_XtFree(quoted_conv_fn);
+ XtFree(quoted_src_fn);
+ XtFree(quoted_conv_fn);
if (strstr(gv_gs_cmd_scan_pdf, "-P") || !gv_gs_safer)
strcpy(tmp, gv_gs_cmd_scan_pdf);
@@ -288,7 +287,7 @@
save_copyToFile(save_filename,src_filename,pagelist,scanstyle)
if (!error) {
if (pagelist) {
Document src_doc=NULL;
- String s = GV_XtNewString(src_filename);
+ String s = XtNewString(src_filename);
s = file_getUsefulName(s);
INFMESSAGE(scanning document)
doc_scanFile(&src_file,&src_doc,src_filename,s,NULL,NULL,NULL,NULL,scanstyle,gv_gs_safeDir);
@@ -300,7 +299,7 @@
save_copyToFile(save_filename,src_filename,pagelist,scanstyle)
char *error_scan_fail = "Failed to scan file %s\n";
char tmp[512];
sprintf(tmp,error_scan_fail,src_filename);
- error=GV_XtNewString(tmp);
+ error=XtNewString(tmp);
}
} else {
char buf[BUFSIZ];
@@ -340,11 +339,11 @@ save_saveFile(sd)
{
s = sd->save_fn ? sd->save_fn : sd->src_fn;
- s = GV_XtNewString(s);
+ s = XtNewString(s);
s = file_getUsefulName(s);
s = file_pdfname2psname(s);
sd->conv_fn = file_getTmpFilename(NULL, s, NULL);
- GV_XtFree(s);
+ XtFree(s);
if (sd->conv_fn == NULL)
return XtNewString("Cannot create temporary file!");
INFSMESSAGE(converting from file,sd->src_fn)
@@ -359,11 +358,11 @@ save_saveFile(sd)
if (!error && sd->save_to_file) {
if (!sd->save_fn) {
- s = GV_XtNewString(sd->src_fn);
+ s = XtNewString(sd->src_fn);
s = file_getUsefulName(s);
s = file_pdfname2psname(s);
sd->save_fn = file_getTmpFilename(NULL, s, NULL);
- GV_XtFree(s);
+ XtFree(s);
}
if (!sd->save_fn) {
error = XtNewString("Cannot create temporary file!");
diff --git a/gv/src/scale.c b/gv/src/scale.c
index 3415c05..1463ebd 100644
--- a/gv/src/scale.c
+++ b/gv/src/scale.c
@@ -46,7 +46,6 @@
#include "types.h"
#include "config.h"
#include "types.h"
-#include "d_memdebug.h"
#include "options.h"
#include "resource.h"
#include "scale.h"
@@ -64,11 +63,11 @@ void scale_freeScales(scales)
int i=0;
BEGINMESSAGE(scale_freeScales)
while (scales[i]) {
- if (scales[i]->name) GV_XtFree(scales[i]->name);
- GV_XtFree(scales[i]);
+ XtFree(scales[i]->name);
+ XtFree((XtPointer)scales[i]);
i++;
}
- if (scales) GV_XtFree(scales);
+ XtFree((XtPointer)scales);
ENDMESSAGE(scale_freeScales)
}
@@ -79,7 +78,7 @@ void scale_freeScales(scales)
static Scale scale_mallocScale(void)
{
Scale scale;
- scale = (Scale) GV_XtMalloc(sizeof(ScaleStruct));
+ scale = (Scale) XtMalloc(sizeof(ScaleStruct));
memset((void*)scale ,0,sizeof(ScaleStruct));
return scale;
}
@@ -99,7 +98,7 @@ Scale *scale_parseScales(s)
s =options_squeezeMultiline(s);
for (n=1,c=s; (c = strchr(c,'\n')); n++, c++);
INFIMESSAGE(number of scales,n)
- mscales = scales = (Scale*) GV_XtMalloc((n+3)*sizeof(Scale));
+ mscales = scales = (Scale*) XtMalloc((n+3)*sizeof(Scale));
c=s;
if (*s) while (n>0) {
nl = strchr(c,'\n');
@@ -110,7 +109,7 @@ Scale *scale_parseScales(s)
else i=sscanf(c," %[^,] , %f , %[^,] ",name,&f,kind);
if (i>=2 && f>=-3.1) {
scale = scale_mallocScale();
- scale->name = GV_XtNewString(name);
+ scale->name = XtNewString(name);
if (f>0)
scale->scale = sqrt(f);
else
@@ -130,14 +129,14 @@ Scale *scale_parseScales(s)
}
if (!have_center) {
scale = scale_mallocScale();
- scale->name = GV_XtNewString("1.000");
+ scale->name = XtNewString("1.000");
scale->scale = 1.0;
scale->is_center=1;
*scales++ = scale;
}
if (!have_base) {
scale = scale_mallocScale();
- scale->name = GV_XtNewString("Natural size");
+ scale->name = XtNewString("Natural size");
scale->scale = 1.0;
scale->is_base=SCALE_IS_REAL_BASED;
*scales++ = scale;
@@ -160,7 +159,7 @@ Scale *scale_parseScales(s)
}
else n++;
}
- GV_XtFree(s);
+ XtFree(s);
ENDMESSAGE(scale_parseScales)
return(mscales);
}
diff --git a/gv/src/vms_dir.c b/gv/src/vms_dir.c
index 4e07aa2..1e08929 100644
--- a/gv/src/vms_dir.c
+++ b/gv/src/vms_dir.c
@@ -47,7 +47,6 @@
/* --- INCLUDE BEGIN -------- */
# include "vms_dir.h"
-# include "d_memdebug.h"
/* --- INCLUDE END ---------- */
#define NOWILD 0x00000001
@@ -129,9 +128,9 @@ DIR *opendir( dirname )
return (retdir);
}
- retdir = (DIR *) GV_malloc(sizeof(DIR));
+ retdir = (DIR *) malloc(sizeof(DIR));
if (!retdir) {
- INFMESSAGE(cannot GV_malloc retdir) ENDMESSAGE(opendir)
+ INFMESSAGE(cannot malloc retdir) ENDMESSAGE(opendir)
return (retdir);
}
@@ -141,24 +140,24 @@ DIR *opendir( dirname )
if (!Check_Directory(path)) {
INFMESSAGE(cannot open) ENDMESSAGE(opendir)
- GV_free(retdir);
+ free(retdir);
return ((DIR *)NULL);
}
- filepathname = (char *) GV_malloc((MAXNAMLEN+1)*sizeof(char));
+ filepathname = (char *) malloc((MAXNAMLEN+1)*sizeof(char));
if (!filepathname) {
INFMESSAGE(cannot malloc filepathname) ENDMESSAGE(opendir)
- GV_free(retdir);
+ free(retdir);
return ((DIR *)NULL);
}
strcpy(filepathname, path);
strcat(filepathname, "*.*.*");
- retdescrip = (struct dsc$descriptor_s *) GV_malloc(sizeof(struct
dsc$descriptor_s));
+ retdescrip = (struct dsc$descriptor_s *) malloc(sizeof(struct
dsc$descriptor_s));
if (!retdescrip) {
INFMESSAGE(cannot malloc retdescrip) ENDMESSAGE(opendir)
- GV_free(retdir);
- GV_free(filepathname);
+ free(retdir);
+ free(filepathname);
return ((DIR *)NULL);
}
retdescrip->dsc$b_dtype = DSC$K_DTYPE_T;
@@ -168,12 +167,12 @@ DIR *opendir( dirname )
retdir->dd_fd = (unsigned long) retdescrip;
retdir->dd_loc = 0;
- retdir->dd_buf = (struct dirent *) GV_malloc(sizeof(struct dirent));
+ retdir->dd_buf = (struct dirent *) malloc(sizeof(struct dirent));
if (!(retdir->dd_buf)) {
INFMESSAGE(cannot malloc dd_buf) ENDMESSAGE(opendir)
- GV_free(retdir);
- GV_free(filepathname);
- GV_free(retdescrip);
+ free(retdir);
+ free(filepathname);
+ free(retdescrip);
return ((DIR *)NULL);
}
@@ -246,10 +245,10 @@ int closedir(dirp)
{
BEGINMESSAGE(closedir)
lib$find_file_end (&dirp->dd_loc);
- GV_free (((struct dsc$descriptor_s*)dirp->dd_fd)->dsc$a_pointer);
- GV_free ((void*)dirp->dd_fd);
- GV_free ((void*)dirp->dd_buf);
- GV_free ((void*)dirp);
+ free (((struct dsc$descriptor_s*)dirp->dd_fd)->dsc$a_pointer);
+ free ((void*)dirp->dd_fd);
+ free ((void*)dirp->dd_buf);
+ free ((void*)dirp);
ENDMESSAGE(closedir)
return(0);
}
diff --git a/gv/src/widgets_misc.c b/gv/src/widgets_misc.c
index c9859d0..15f67ab 100644
--- a/gv/src/widgets_misc.c
+++ b/gv/src/widgets_misc.c
@@ -49,7 +49,6 @@
#include "Switch.h"
#include "types.h"
-#include "d_memdebug.h"
#include "main_resources.h"
#include "main_globals.h"
#include "widgets_misc.h"
--
1.5.6.5
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-gv] [PATCH] remove ancient memory debugging stuff,
Bernhard R. Link <=