Enlightenment CVS committal
Author : gilbertt
Project : misc
Module : scrot
Dir : misc/scrot/src
Modified Files:
debug.h imlib.c main.c options.c
Log Message:
Tue Feb 25 13:13:03 GMT 2003 Tom Gilbert <[EMAIL PROTECTED]>
* Update for latest giblib. Requires latest release now.
===================================================================
RCS file: /cvsroot/enlightenment/misc/scrot/src/debug.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- debug.h 5 Nov 2000 02:49:04 -0000 1.2
+++ debug.h 25 Feb 2003 13:14:22 -0000 1.3
@@ -26,17 +26,6 @@
#ifndef DEBUG_H
#define DEBUG_H
-#define DEBUG
-
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#define emalloc(a) malloc(a)
-#define estrdup(a) strdup(a)
-#define erealloc(a,b) realloc(a,b)
-#else
-#define emalloc(a) _emalloc(a)
-#define estrdup(a) _estrdup(a)
-#define erealloc(a,b) _erealloc(a,b)
-#endif
+/* #define DEBUG */
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/scrot/src/imlib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- imlib.c 4 Dec 2000 23:45:54 -0000 1.4
+++ imlib.c 25 Feb 2003 13:14:22 -0000 1.5
@@ -38,7 +38,7 @@
{
disp = XOpenDisplay(dispstr);
if (!disp)
- eprintf("Can't open X display. It *is* running, yeah?");
+ gib_eprintf("Can't open X display. It *is* running, yeah?");
if (screen_num)
scr = ScreenOfDisplay(disp, screen_num);
else
===================================================================
RCS file: /cvsroot/enlightenment/misc/scrot/src/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- main.c 23 Feb 2002 12:38:20 -0000 1.14
+++ main.c 25 Feb 2003 13:14:22 -0000 1.15
@@ -40,8 +40,8 @@
init_x_and_imlib(NULL, 0);
if (!opt.output_file) {
- opt.output_file = estrdup("%Y-%m-%d-%H%M%S_$wx$h_scrot.png");
- opt.thumb_file = estrdup("%Y-%m-%d-%H%M%S_$wx$h_scrot-thumb.png");
+ opt.output_file = gib_estrdup("%Y-%m-%d-%H%M%S_$wx$h_scrot.png");
+ opt.thumb_file = gib_estrdup("%Y-%m-%d-%H%M%S_$wx$h_scrot-thumb.png");
}
@@ -57,7 +57,7 @@
}
if (!image)
- eprintf("no image grabbed");
+ gib_eprintf("no image grabbed");
imlib_context_set_image(image);
imlib_image_attach_data_value("quality", NULL, opt.quality, NULL);
@@ -65,7 +65,7 @@
filename = im_printf(opt.output_file, NULL, image);
gib_imlib_save_image_with_error_return(image, filename, &err);
if (err)
- eprintf("Saving to file %s failed\n", filename);
+ gib_eprintf("Saving to file %s failed\n", filename);
if (opt.thumb) {
int cwidth, cheight;
@@ -76,12 +76,12 @@
cwidth * opt.thumb / 100,
cheight * opt.thumb / 100, 1);
if (thumbnail == NULL)
- eprintf("Unable to create scaled Image\n");
+ gib_eprintf("Unable to create scaled Image\n");
else {
filename = im_printf(opt.thumb_file, NULL, thumbnail);
gib_imlib_save_image_with_error_return(thumbnail, filename, &err);
if (err)
- eprintf("Saving thumbnail %s failed\n", filename);
+ gib_eprintf("Saving thumbnail %s failed\n", filename);
}
}
if (opt.exec)
@@ -173,12 +173,12 @@
(disp, root, False,
ButtonMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync,
GrabModeAsync, root, cursor, CurrentTime) != GrabSuccess))
- eprintf("couldn't grab pointer:");
+ gib_eprintf("couldn't grab pointer:");
if ((XGrabKeyboard
(disp, root, False, GrabModeAsync, GrabModeAsync,
CurrentTime) != GrabSuccess))
- eprintf("couldn't grab keyboard:");
+ gib_eprintf("couldn't grab keyboard:");
while (1) {
@@ -250,7 +250,7 @@
count = select(fdsize, &fdset, NULL, NULL, NULL);
if ((count < 0)
&& ((errno == ENOMEM) || (errno == EINVAL) || (errno == EBADF)))
- eprintf("Connection to X display lost");
+ gib_eprintf("Connection to X display lost");
}
if (rect_w) {
XDrawRectangle(disp, root, gc, rect_x, rect_y, rect_w, rect_h);
@@ -456,7 +456,7 @@
} else
strncat(ret, c, 1);
}
- return estrdup(ret);
+ return gib_estrdup(ret);
}
Window
@@ -534,7 +534,7 @@
dispstr = DisplayString(disp);
- subdisp = estrdup(DisplayString(disp));
+ subdisp = gib_estrdup(DisplayString(disp));
for (i = 0; i < screens; i++) {
dispstr = strchr(subdisp, ':');
===================================================================
RCS file: /cvsroot/enlightenment/misc/scrot/src/options.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- options.c 24 Aug 2001 21:31:52 -0000 1.18
+++ options.c 25 Feb 2003 13:14:23 -0000 1.19
@@ -84,7 +84,7 @@
opt.delay = atoi(optarg);
break;
case 'e':
- opt.exec = estrdup(optarg);
+ opt.exec = gib_estrdup(optarg);
break;
case 'm':
opt.multidisp = 1;
@@ -127,7 +127,7 @@
opt.thumb_file = name_thumbnail(opt.output_file);
}
else
- weprintf("unrecognised option %s\n", argv[optind++]);
+ gib_weprintf("unrecognised option %s\n", argv[optind++]);
}
}
@@ -144,7 +144,7 @@
size_t diff = 0;
length = strlen(name) + 7;
- new_title = emalloc(length);
+ new_title = gib_emalloc(length);
dot_pos = strrchr(name, '.');
if (dot_pos)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
