Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/dox
Modified Files:
dox.c dox.h file.c format.c text.c ttfont.c
Log Message:
Remove unused code, enable compiling with -Wshadow.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/dox.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- dox.c 20 Mar 2004 15:28:04 -0000 1.25
+++ dox.c 20 Mar 2004 15:36:32 -0000 1.26
@@ -90,7 +90,6 @@
#endif
Window win_main, win_title, win_exit, win_next, win_prev, win_text,
win_cover;
-int w, h, t;
Imlib_Image *im_text;
Imlib_Image *im_title;
Imlib_Image *im_prev1, *im_prev2;
@@ -220,7 +219,7 @@
main(int argc, char **argv)
{
int pagenum;
- int i, w, h, x, y;
+ int i, w, h, t, x, y;
int wx, wy;
FILE *f;
char *s, *docfile = NULL;
@@ -494,8 +493,6 @@
ApplyImage2(win_exit, im_exit2);
else
{
- int x, y;
-
x = ev.xbutton.x;
y = ev.xbutton.y;
ll = l;
@@ -642,7 +639,6 @@
case MotionNotify:
while (XCheckTypedEvent(disp, ev.type, &ev));
{
- int x, y;
static Link *pl = NULL;
char found = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/dox.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- dox.h 20 Mar 2004 15:28:04 -0000 1.27
+++ dox.h 20 Mar 2004 15:36:32 -0000 1.28
@@ -299,41 +299,9 @@
int x, int y, int w, int h, int fsize,
int justification);
-char *FileExtension(char *file);
-void md(char *s);
-int exists(char *s);
-void mkdirs(char *s);
-int isfile(char *s);
-int isdir(char *s);
-char **ls(char *dir, int *num);
void freestrlist(char **l, int num);
-void rm(char *s);
-void mv(char *s, char *ss);
-void cp(char *s, char *ss);
-time_t moddate(char *s);
-int filesize(char *s);
-int fileinode(char *s);
-int filedev(char *s);
-void cd(char *s);
-char *cwd(void);
-int permissions(char *s);
-int owner(char *s);
-int group(char *s);
-char *username(int uid);
-char *homedir(int uid);
-char *usershell(int uid);
-char *atword(char *s, int num);
-char *atchar(char *s, char c);
-char *getword(char *s, int num);
void word(char *s, int num, char *wd);
void word_mb(char *s, int num, char *wd, int *spaceflag);
-int canread(char *s);
-int canwrite(char *s);
-int canexec(char *s);
-char *fileof(char *s);
-char *fullfileof(char *s);
-char *pathtoexec(char *file);
-char *pathtofile(char *file);
int findLocalizedFile(char *fname);
void AddPage(Object * obj);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- file.c 18 Feb 2004 22:18:40 -0000 1.13
+++ file.c 20 Mar 2004 15:36:32 -0000 1.14
@@ -26,29 +26,7 @@
# include <wctype.h>
#endif
-char *
-FileExtension(char *file)
-{
- char *p;
-
- p = strrchr(file, '.');
- if (p != NULL)
- {
- return (p + 1);
- }
- return ("");
-}
-
-void
-md(char *s)
-{
- if ((!s) || (!*s))
- return;
- mkdir(s, S_IRWXU);
- return;
-}
-
-int
+static int
exists(char *s)
{
struct stat st;
@@ -61,124 +39,6 @@
}
void
-mkdirs(char *s)
-{
- char ss[FILEPATH_LEN_MAX];
- int i, ii;
-
- i = 0;
- ii = 0;
- while (s[i])
- {
- ss[ii++] = s[i];
- ss[ii] = 0;
- if (s[i] == '/')
- {
- if (!exists(ss))
- md(ss);
- else if (!isdir(ss))
- return;
- }
- i++;
- }
-}
-
-int
-isfile(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (stat(s, &st) < 0)
- return (0);
- if (S_ISREG(st.st_mode))
- return (1);
- return (0);
-}
-
-int
-isdir(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (stat(s, &st) < 0)
- return (0);
- if (S_ISDIR(st.st_mode))
- return (1);
- return (0);
-}
-
-char **
-ls(char *dir, int *num)
-{
- int i, dirlen;
- int done = 0;
- DIR *dirp;
- char **names;
- struct dirent *dp;
-
- if ((!dir) || (!*dir))
- return (0);
- dirp = opendir(dir);
- if (!dirp)
- {
- *num = 0;
- return (NULL);
- }
- /* count # of entries in dir (worst case) */
- for (dirlen = 0; (dp = readdir(dirp)) != NULL; dirlen++);
- if (!dirlen)
- {
- closedir(dirp);
- *num = dirlen;
- return (NULL);
- }
- names = (char **)malloc(dirlen * sizeof(char *));
-
- if (!names)
- return (NULL);
-
- rewinddir(dirp);
- for (i = 0; i < dirlen;)
- {
- dp = readdir(dirp);
- if (!dp)
- break;
- if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
- {
- names[i] = strdup(dp->d_name);
- i++;
- }
- }
-
- if (i < dirlen)
- dirlen = i; /* dir got shorter... */
- closedir(dirp);
- *num = dirlen;
- /* do a simple bubble sort here to alphanumberic it */
- while (!done)
- {
- done = 1;
- for (i = 0; i < dirlen - 1; i++)
- {
- if (strcmp(names[i], names[i + 1]) > 0)
- {
- char *tmp;
-
- tmp = names[i];
- names[i] = names[i + 1];
- names[i + 1] = tmp;
- done = 0;
- }
- }
- }
- return (names);
-}
-
-void
freestrlist(char **l, int num)
{
if (!l)
@@ -191,343 +51,6 @@
}
void
-rm(char *s)
-{
- if ((!s) || (!*s))
- return;
- unlink(s);
- return;
-}
-
-void
-mv(char *s, char *ss)
-{
- if ((!s) || (!ss) || (!*s) || (!*ss))
- return;
- rename(s, ss);
- return;
-}
-
-void
-cp(char *s, char *ss)
-{
- int i;
- FILE *f, *ff;
- unsigned char buf[1];
-
- if ((!s) || (!ss) || (!*s) || (!*ss))
- return;
- if (!exists(s))
- return;
- i = filesize(s);
- f = fopen(s, "r");
- if (!f)
- return;
- ff = fopen(ss, "w");
- if (!ff)
- {
- fclose(f);
- return;
- }
- while (fread(buf, 1, 1, f))
- fwrite(buf, 1, 1, ff);
- fclose(f);
- fclose(ff);
- return;
-}
-
-time_t
-moddate(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (!stat(s, &st) < 0)
- return (0);
- if (st.st_mtime > st.st_ctime)
- {
- return (st.st_mtime);
- }
- else
- return (st.st_ctime);
- return (0);
-}
-
-int
-filesize(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (stat(s, &st) < 0)
- return (0);
- return ((int)st.st_size);
-}
-
-int
-fileinode(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (stat(s, &st) < 0)
- return (0);
- return ((int)st.st_ino);
-}
-
-int
-filedev(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (stat(s, &st) < 0)
- return (0);
- return ((int)st.st_dev);
-}
-
-void
-cd(char *s)
-{
- if ((!s) || (!*s))
- return;
- chdir(s);
- return;
-}
-
-char *
-cwd(void)
-{
- char *s;
- char ss[FILEPATH_LEN_MAX];
-
- getcwd(ss, FILEPATH_LEN_MAX);
- s = strdup(ss);
- return (s);
-}
-
-int
-permissions(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (!stat(s, &st) < 0)
- return (0);
- return (st.st_mode);
-}
-
-int
-owner(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (!stat(s, &st) < 0)
- return (0);
- return (st.st_uid);
-}
-
-int
-group(char *s)
-{
- struct stat st;
-
- if ((!s) || (!*s))
- return (0);
- if (!stat(s, &st) < 0)
- return (0);
- return (st.st_gid);
-}
-
-char *
-username(int uid)
-{
- static int usr_uid = -1;
- static char *usr_s = NULL;
- char *s;
- struct passwd *pwd;
-
- if (usr_uid < 0)
- usr_uid = getuid();
- if ((uid == usr_uid) && (usr_s))
- return strdup(usr_s);
- pwd = getpwuid(uid);
- if (pwd)
- {
- s = strdup(pwd->pw_name);
- if (uid == usr_uid)
- usr_s = strdup(s);
- return (s);
- }
- return (strdup("unknown"));
-}
-
-char *
-homedir(int uid)
-{
- static int usr_uid = -1;
- static char *usr_s = NULL;
- char *s;
- struct passwd *pwd;
-
- if (usr_uid < 0)
- usr_uid = getuid();
- if ((uid == usr_uid) && (usr_s))
- return strdup(usr_s);
- pwd = getpwuid(uid);
- if (pwd)
- {
- s = strdup(pwd->pw_dir);
- if (uid == usr_uid)
- usr_s = strdup(s);
- return (s);
- }
- return (strdup("/tmp"));
-}
-
-char *
-usershell(int uid)
-{
- static int usr_uid = -1;
- static char *usr_s = NULL;
- char *s;
- struct passwd *pwd;
-
- if (usr_uid < 0)
- usr_uid = getuid();
- if ((uid == usr_uid) && (usr_s))
- return strdup(usr_s);
- pwd = getpwuid(uid);
- if (pwd)
- {
- s = strdup(pwd->pw_shell);
- if (uid == usr_uid)
- usr_s = strdup(s);
- return (s);
- }
- return (strdup("/bin/sh"));
-}
-
-char *
-atword(char *s, int num)
-{
- int cnt, i;
-
- if (!s)
- return (NULL);
- cnt = 0;
- i = 0;
-
- while (s[i])
- {
- if ((s[i] != ' ') && (s[i] != '\t'))
- {
- if (i == 0)
- cnt++;
- else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
- cnt++;
- if (cnt == num)
- return (&s[i]);
- }
- i++;
- }
- return (NULL);
-}
-
-char *
-atchar(char *s, char c)
-{
- int i;
-
- if (!s)
- return (NULL);
- i = 0;
- while (s[i] != 0)
- {
- if (s[i] == c)
- return (&s[i]);
- i++;
- }
- return (NULL);
-}
-
-char *
-getword(char *s, int num)
-{
-
- /* *********FIXME**************
- * This function is broken but it isn't in use so I'll fix it later
- * (DO NOT USE UNTIL FIXED
- */
- int cnt, i;
- char *start, *finish, *ss, *w;
- char *wd = NULL;
-
- if (!s)
- return (NULL);
- if (!wd)
- return (NULL);
- if (num <= 0)
- {
- *wd = 0;
- return (NULL);
- }
- cnt = 0;
- i = 0;
- start = NULL;
- finish = NULL;
- ss = NULL;
- w = wd;
-
- while (s[i])
- {
- if ((cnt == num) && ((s[i] == ' ') || (s[i] == '\t')))
- {
- finish = &s[i];
- break;
- }
- if ((s[i] != ' ') && (s[i] != '\t'))
- {
- if (i == 0)
- {
- cnt++;
- if (cnt == num)
- start = &s[i];
- }
- else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
- {
- cnt++;
- if (cnt == num)
- start = &s[i];
- }
- }
- i++;
- }
- if (cnt == num)
- {
- if ((start) && (finish))
- {
- for (ss = start; ss < finish; ss++)
- *wd++ = *ss;
- }
- else if (start)
- {
- for (ss = start; *ss != 0; ss++)
- *wd++ = *ss;
- }
- *wd = 0;
- }
- return (wd);
-}
-
-void
word(char *s, int num, char *wd)
{
int cnt, i;
@@ -747,192 +270,6 @@
#endif
int
-canread(char *s)
-{
- if ((!s) || (!*s))
- return (0);
-
- if (!(permissions(s) & (S_IRUSR | S_IRGRP | S_IROTH)))
- return (0);
-
- return (1 + access(s, R_OK));
-}
-
-int
-canwrite(char *s)
-{
- if ((!s) || (!*s))
- return (0);
-
- if (!(permissions(s) & (S_IWUSR | S_IWGRP | S_IWOTH)))
- return (0);
-
- return (1 + access(s, W_OK));
-}
-
-int
-canexec(char *s)
-{
- if ((!s) || (!*s))
- return (0);
-
- if (!(permissions(s) & (S_IXUSR | S_IXGRP | S_IXOTH)))
- return (0);
-
- return (1 + access(s, X_OK));
-}
-
-char *
-fileof(char *s)
-{
- char ss[1024];
- int i, p1, p2;
-
- i = 0;
- p1 = -1;
- p2 = -1;
- for (i = strlen(s) - 1; i >= 0; i--)
- {
- if ((s[i] == '.') && (p2 < 0) && (p1 < 0))
- p2 = i;
- if ((s[i] == '/') && (p1 < 0))
- p1 = i;
- }
- if (p2 < 0)
- p2 = strlen(s);
- if (p1 < 0)
- p1 = 0;
- for (i = 0; i < (p2 - p1 - 1); i++)
- ss[i] = s[p1 + 1 + i];
- ss[i] = 0;
- return (strdup(ss));
-}
-
-char *
-fullfileof(char *s)
-{
- char ss[1024];
- int i, p1, p2;
-
- i = 0;
- p1 = -1;
- for (i = strlen(s) - 1; i >= 0; i--)
- {
- if ((s[i] == '/') && (p1 < 0))
- p1 = i;
- }
- p2 = strlen(s);
- for (i = 0; i < (p2 - p1 - 1); i++)
- ss[i] = s[p1 + 1 + i];
- ss[i] = 0;
- return (strdup(ss));
-}
-
-char *
-pathtoexec(char *file)
-{
- char *p, *cp, *ep;
- char *s;
- int len, exelen;
-
- if (file[0] == '/')
- {
- if (canexec(file))
- return (strdup(file));
- }
- p = getenv("PATH");
- if (!p)
- return (strdup(file));
- if (!file)
- return (NULL);
- cp = p;
- exelen = strlen(file);
- while ((ep = strchr(cp, ':')))
- {
- len = ep - cp;
- s = malloc(len + 1);
- if (s)
- {
- strncpy(s, cp, len);
- s[len] = 0;
- s = realloc(s, len + 2 + exelen);
- strcat(s, "/");
- strcat(s, file);
- if (canexec(s))
- return (s);
- free(s);
- }
- cp = ep + 1;
- }
- len = strlen(cp);
- s = malloc(len + 1);
- if (s)
- {
- strncpy(s, cp, len);
- s[len] = 0;
- s = realloc(s, len + 2 + exelen);
- strcat(s, "/");
- strcat(s, file);
- if (canexec(s))
- return (s);
- free(s);
- }
- return (NULL);
-}
-
-char *
-pathtofile(char *file)
-{
- char *p, *cp, *ep;
- char *s;
- int len, exelen;
-
- if (file[0] == '/')
- {
- if (exists(file))
- return (strdup(file));
- }
- p = getenv("PATH");
- if (!p)
- return (strdup(file));
- if (!file)
- return (NULL);
- cp = p;
- exelen = strlen(file);
- while ((ep = strchr(cp, ':')))
- {
- len = ep - cp;
- s = malloc(len + 1);
- if (s)
- {
- strncpy(s, cp, len);
- s[len] = 0;
- s = realloc(s, len + 2 + exelen);
- strcat(s, "/");
- strcat(s, file);
- if (exists(s))
- return (s);
- free(s);
- }
- cp = ep + 1;
- }
- len = strlen(cp);
- s = malloc(len + 1);
- if (s)
- {
- strncpy(s, cp, len);
- s[len] = 0;
- s = realloc(s, len + 2 + exelen);
- strcat(s, "/");
- strcat(s, file);
- if (exists(s))
- return (s);
- free(s);
- }
- return (NULL);
-}
-
-int
findLocalizedFile(char *fname)
{
char *tmp, *lang, *p[3];
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/format.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- format.c 13 Feb 2004 18:13:55 -0000 1.15
+++ format.c 20 Mar 2004 15:36:32 -0000 1.16
@@ -559,7 +559,7 @@
Font_ *fn;
P_ *p;
int wc, eol, eot;
- int link = 0, lx, lw;
+ int islink = 0, lx, lw;
switch (pg->obj[i].type)
{
@@ -682,18 +682,18 @@
{
link_txt[0] = '\0';
link_link[0] = '\0';
- link = 1;
+ islink = 1;
oldwc = wc;
TextSize(&ts, s, &lx, &th, 17);
}
- if (link == 1)
+ if (islink == 1)
{
if (eol || ((wd[0] != '_') && spaceflag)) /* if NO link
tag, ... */
{
link_txt[0] = '\0';
link_link[0] = '\0';
- link = 0;
+ islink = 0;
wc = oldwc;
#ifdef HAVE_WCTYPE_H
if (MB_CUR_MAX > 1)
@@ -739,7 +739,7 @@
strcpy(link_link, wd + j);
link_link[strlen(link_link) - 1] = '\0';
strcpy(wd, link_txt);
- link = 2;
+ islink = 2;
}
else
continue;
@@ -808,7 +808,7 @@
if ((eot == 1) && (tw > xspace))
{
char p1[4096];
- int point = 0, cnt = 0, i, len;
+ int point = 0, cnt = 0, ii, len;
while (txt_disp[(point + cnt)])
{
@@ -820,7 +820,7 @@
continue;
}
else
- for (i = 0; i < len; i++, cnt++)
+ for (ii = 0; ii < len; ii++, cnt++)
p1[cnt] = txt_disp[point + cnt];
p1[cnt] = 0;
TextSize(&ts, p1, &tw, &th, 17);
@@ -928,15 +928,15 @@
wastext = 1;
TextDraw(&ts, win, txt_disp, x + off, y,
xspace, 99999, 17, justification);
- if (link > 1 && !strcmp(wd, link_txt))
+ if (islink > 1 && !strcmp(wd, link_txt))
{
- link = 0;
+ islink = 0;
link_link[0] = '\0';
link_txt[0] = '\0';
wc = oldwc - 1;
}
- if (link > 1)
+ if (islink > 1)
{
int rr, gg, bb;
int extra;
@@ -961,7 +961,7 @@
x + off + lx + lw + extra,
y + ts.xfontset_ascent);
ESetColor(&ts.fg_col, rr, gg, bb);
- link = 0;
+ islink = 0;
XFreeGC(disp, gc);
{
Link *l;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/text.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- text.c 18 Mar 2004 17:03:29 -0000 1.13
+++ text.c 20 Mar 2004 15:36:32 -0000 1.14
@@ -75,18 +75,18 @@
if (!ts->efont)
#endif
{
- char s[4096], w[4046], *dup, *ss;
+ char s[4096], w[4046], *s2, *ss;
- dup = NULL;
- dup = strdup(ts->fontname);
- ss = strchr(dup, '/');
+ s2 = NULL;
+ s2 = strdup(ts->fontname);
+ ss = strchr(s2, '/');
if (ss)
{
*ss = ' ';
- word(dup, 1, w);
+ word(s2, 1, w);
sprintf(s, "%s/%s.ttf", docdir, w);
findLocalizedFile(s);
- word(dup, 2, w);
+ word(s2, 2, w);
ts->efont = Efont_load(s, atoi(w));
if (ts->efont)
{
@@ -98,8 +98,8 @@
ts->height = as + ds;
}
}
- if (dup)
- free(dup);
+ if (s2)
+ free(s2);
}
#if USE_FNLIB
if ((!ts->font) && (!ts->efont))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/ttfont.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ttfont.c 20 Mar 2004 15:20:40 -0000 1.12
+++ ttfont.c 20 Mar 2004 15:36:32 -0000 1.13
@@ -30,21 +30,21 @@
};
static void
-ImlibSetFgColorFromGC(Display * disp, GC gc, Colormap cm)
+ImlibSetFgColorFromGC(Display * dpy, GC gc, Colormap cm)
{
XGCValues xgcv;
XColor xclr;
int r, g, b;
- XGetGCValues(disp, gc, GCForeground, &xgcv);
+ XGetGCValues(dpy, gc, GCForeground, &xgcv);
xclr.pixel = xgcv.foreground;
- XQueryColor(disp, cm, &xclr);
+ XQueryColor(dpy, cm, &xclr);
EGetColor(&xclr, &r, &g, &b);
imlib_context_set_color(r, g, b, 255);
}
void
-EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
+EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y, char *text,
Efont * f, Visual * vis __UNUSED__, Colormap cm)
{
Imlib_Image im;
@@ -58,7 +58,7 @@
imlib_context_set_image(im);
imlib_context_set_font(f->face);
- ImlibSetFgColorFromGC(disp, gc, cm);
+ ImlibSetFgColorFromGC(dpy, gc, cm);
imlib_text_draw(0, 0, text);
imlib_render_image_on_drawable(x, y - ascent);
imlib_free_image();
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
