Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h file.c fx.c
Log Message:
Don't use getword.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.6
retrieving revision 1.314.2.7
diff -u -3 -r1.314.2.6 -r1.314.2.7
--- E.h 8 Aug 2004 00:02:16 -0000 1.314.2.6
+++ E.h 8 Aug 2004 00:24:23 -0000 1.314.2.7
@@ -1962,7 +1962,6 @@
char *usershell(int uid);
const char *atword(const char *s, int num);
const char *atchar(const char *s, char c);
-char *getword(char *s, int num);
void word(const char *s, int num, char *wd);
int canread(const char *s);
int canwrite(const char *s);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -3 -r1.62 -r1.62.2.1
--- file.c 12 Jul 2004 23:33:15 -0000 1.62
+++ file.c 8 Aug 2004 00:24:23 -0000 1.62.2.1
@@ -510,76 +510,6 @@
EDBUG_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;
-
- EDBUG(9, "getword");
- if (!s)
- EDBUG_RETURN(NULL);
- if (!wd)
- EDBUG_RETURN(NULL);
- if (num <= 0)
- {
- *wd = 0;
- EDBUG_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;
- }
- EDBUG_RETURN(wd);
-}
-
void
word(const char *s, int num, char *wd)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -3 -r1.41 -r1.41.2.1
--- fx.c 25 Jul 2004 09:34:43 -0000 1.41
+++ fx.c 8 Aug 2004 00:24:23 -0000 1.41.2.1
@@ -891,6 +891,7 @@
FX_imagespinner_info();
}
+#if 0 /* Don't use getword */
/* do stuff here */
string = getword(fx_imagespinner_params, fx_imagespinner_count);
if (!string)
@@ -898,6 +899,7 @@
fx_imagespinner_count = 3;
string = getword(fx_imagespinner_params, fx_imagespinner_count);
}
+#endif
fx_imagespinner_count++;
if (string)
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
