Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h file.c fx.c
Log Message:
Eliminate getword().
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -3 -r1.325 -r1.326
--- E.h 31 Aug 2004 17:24:39 -0000 1.325
+++ E.h 7 Sep 2004 19:36:33 -0000 1.326
@@ -2083,7 +2083,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.63
diff -u -3 -r1.62 -r1.63
--- file.c 12 Jul 2004 23:33:15 -0000 1.62
+++ file.c 7 Sep 2004 19:36:34 -0000 1.63
@@ -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.42
diff -u -3 -r1.41 -r1.42
--- fx.c 25 Jul 2004 09:34:43 -0000 1.41
+++ fx.c 7 Sep 2004 19:36:34 -0000 1.42
@@ -54,10 +54,13 @@
void FX_Waves_Desk(void);
void FX_Waves_Quit(void);
void FX_Waves_Pause(void);
+
+#if 0 /* FIXME - Or remove */
void FX_ImageSpinner_Init(const char *name);
void FX_ImageSpinner_Desk(void);
void FX_ImageSpinner_Quit(void);
void FX_ImageSpinner_Pause(void);
+#endif
static FXHandler fx_handlers[] = {
{"ripples",
@@ -70,10 +73,12 @@
{"waves",
FX_Waves_Init, FX_Waves_Desk, FX_Waves_Quit, FX_Waves_Pause,
0, 0},
+#if 0 /* FIXME - Or remove */
{"imagespinner",
FX_ImageSpinner_Init, FX_ImageSpinner_Desk, FX_ImageSpinner_Quit,
FX_ImageSpinner_Pause,
0, 0}
+#endif
};
#define N_FX_HANDLERS (sizeof(fx_handlers)/sizeof(FXHandler))
@@ -858,6 +863,7 @@
/****************************************************************************/
+#if 0 /* FIXME - Or remove */
/****************************** IMAGESPINNER ********************************/
static Window fx_imagespinner_win = 0;
@@ -971,3 +977,4 @@
}
/****************************************************************************/
+#endif
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
