Enlightenment CVS committal Author : doursse Project : e17 Module : libs/embryo
Dir : e17/libs/embryo/src/bin Modified Files: embryo_cc_prefix.c embryo_cc_sc.h embryo_cc_sc1.c embryo_cc_sc2.c embryo_cc_sc3.c embryo_cc_sc4.c embryo_cc_sc5.c embryo_cc_sc6.c embryo_cc_sc7.c embryo_cc_scexpand.c embryo_cc_sclist.c embryo_cc_scvars.c Log Message: remove trailing spaces and add indent doc for vi =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_prefix.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- embryo_cc_prefix.c 28 Mar 2008 18:32:09 -0000 1.9 +++ embryo_cc_prefix.c 11 Apr 2008 19:06:18 -0000 1.10 @@ -1,8 +1,9 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif #include <stdio.h> @@ -22,7 +23,7 @@ #include <dirent.h> #include <dlfcn.h> /* dlopen,dlclose,etc */ #ifdef HAVE_EVIL -# include <Evil.h> /* for realpath */ +# include <Evil.h> /* for realpath */ #else # include <pwd.h> # include <grp.h> @@ -76,7 +77,7 @@ else snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); _prefix_path_lib = strdup(buf); - + if (getenv("E_DATA_DIR")) snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR")); else @@ -121,7 +122,7 @@ _prefix_path_bin = strdup(buf); snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); _prefix_path_lib = strdup(buf); - + /* check if AUTHORS file is there - then our guess is right */ snprintf(buf, sizeof(buf), "%s/"MAGIC_DAT, _prefix_path); if (stat(buf, &st) == 0) @@ -166,7 +167,7 @@ E_FREE(_prefix_path_data); E_FREE(_prefix_path_lib); } - + void e_prefix_fallback(void) { @@ -207,18 +208,18 @@ /* sometimes this isnt the case - so we need to do a more exhaustive search * through more parent and subdirs. hre is an example i have seen: - * + * * /blah/whatever/exec/bin/exe * -> * /blah/whatever/exec/bin * /blah/whatever/common/share/enlightenment * /blah/whatever/exec/lib */ - + /* this is pure black magic to try and find data shares */ /* 2. cache file doesn't exist or is invalid - we need to search - this is * where the real black magic begins */ - + /* BLACK MAGIC 1: * /blah/whatever/dir1/bin * /blah/whatever/dir2/share/enlightenment @@ -227,7 +228,7 @@ { DIR *dirp; struct dirent *dp; - + snprintf(buf, sizeof(buf), "%s", _prefix_path); p = strrchr(buf, '/'); if (p) *p = 0; @@ -235,7 +236,7 @@ if (dirp) { char *file; - + while ((dp = readdir(dirp))) { if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, ".."))) @@ -253,7 +254,7 @@ closedir(dirp); } } - + /* BLACK MAGIC 2: * /blah/whatever/dir1/bin * /blah/whatever/share/enlightenment @@ -270,13 +271,13 @@ _prefix_path_data = strdup(buf2); } } - + /* add more black magic as required as we discover weridnesss - remember * this is to save users having to set environment variables to tell * e where it lives, so e auto-adapts. so these code snippets are just * logic to figure that out for the user */ - + /* done. we found it - write cache file */ if (_prefix_path_data) { @@ -328,7 +329,7 @@ int len; char *p, mode[5] = ""; unsigned long ptr1 = 0, ptr2 = 0; - + len = strlen(buf); if (buf[len - 1] == '\n') { @@ -369,7 +370,7 @@ char *path, *p, *cp, *s; int len, lenexe; char buf[4096], buf2[4096], buf3[4096]; - + /* 1. is argv0 abs path? */ if (argv0[0] == '/') { =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- embryo_cc_sc.h 11 Apr 2008 05:59:42 -0000 1.15 +++ embryo_cc_sc.h 11 Apr 2008 19:06:18 -0000 1.16 @@ -9,7 +9,7 @@ * Copyright J.E. Hendrix, 1982, 1983 * Copyright T. Riemersma, 1997-2003 * - * Version: $Id: embryo_cc_sc.h,v 1.15 2008/04/11 05:59:42 doursse Exp $ + * Version: $Id: embryo_cc_sc.h,v 1.16 2008/04/11 19:06:18 doursse Exp $ * * This software is provided "as-is", without any express or implied warranty. * In no event will the authors be held liable for any damages arising from @@ -27,6 +27,7 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. */ + #ifndef EMBRYO_CC_SC_H #define EMBRYO_CC_SC_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc1.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- embryo_cc_sc1.c 11 Apr 2008 05:59:42 -0000 1.40 +++ embryo_cc_sc1.c 11 Apr 2008 19:06:18 -0000 1.41 @@ -21,7 +21,11 @@ * must not be misrepresented as being the original software. * 3. This notice may not be removed or altered from any source * distribution. - * Version: $Id: embryo_cc_sc1.c,v 1.40 2008/04/11 05:59:42 doursse Exp $ + * Version: $Id: embryo_cc_sc1.c,v 1.41 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc2.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- embryo_cc_sc2.c 4 Nov 2005 08:16:24 -0000 1.21 +++ embryo_cc_sc2.c 11 Apr 2008 19:06:18 -0000 1.22 @@ -21,7 +21,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc2.c,v 1.21 2005/11/04 08:16:24 sebastid Exp $ + * Version: $Id: embryo_cc_sc2.c,v 1.22 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H @@ -649,7 +653,7 @@ if (c1 != 0x00000000L) { - fprintf(stderr, + fprintf(stderr, "embryo_cc: WARNING! you compiler does not SEEM to interpret IEEE floating\n" "point math as embryo expects. this could be bad.\n" "\n" @@ -661,7 +665,7 @@ } else if (c2 != 0x42480000L) { - fprintf(stderr, + fprintf(stderr, "embryo_cc: WARNING! you compiler does not SEEM to interpret IEEE floating\n" "point math as embryo expects. This could be bad.\n" "\n" =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc3.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- embryo_cc_sc3.c 11 Apr 2008 05:29:33 -0000 1.9 +++ embryo_cc_sc3.c 11 Apr 2008 19:06:18 -0000 1.10 @@ -18,7 +18,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc3.c,v 1.9 2008/04/11 05:29:33 doursse Exp $ + * Version: $Id: embryo_cc_sc3.c,v 1.10 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H @@ -2014,7 +2018,7 @@ /* * Dont need this warning - its varargs. there is no way of knowing the * required tag/type... - * + * if (!checktag(arg[argidx].tags,arg[argidx].numtags,lval.tag)) error(213); */ =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc4.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- embryo_cc_sc4.c 11 Apr 2008 05:59:42 -0000 1.7 +++ embryo_cc_sc4.c 11 Apr 2008 19:06:18 -0000 1.8 @@ -18,7 +18,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc4.c,v 1.7 2008/04/11 05:59:42 doursse Exp $ + * Version: $Id: embryo_cc_sc4.c,v 1.8 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc5.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- embryo_cc_sc5.c 13 Apr 2005 20:01:22 -0000 1.7 +++ embryo_cc_sc5.c 11 Apr 2008 19:06:18 -0000 1.8 @@ -22,7 +22,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc5.c,v 1.7 2005/04/13 20:01:22 tsauerbeck Exp $ + * Version: $Id: embryo_cc_sc5.c,v 1.8 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H @@ -67,10 +71,10 @@ * the error reporting is enabled only in the second pass (and only when * actually producing output). Fatal errors may never be ignored. */ - if (((errflag) || (sc_status != statWRITE)) && + if (((errflag) || (sc_status != statWRITE)) && ((number < 100) || (number >= 200))) return 0; - + if (number < 100) { msg = errmsg[number - 1]; @@ -121,7 +125,7 @@ } /* if */ /* check whether we are seeing many errors on the same line */ - if (((errstart < 0) && (lastline != fline)) || + if (((errstart < 0) && (lastline != fline)) || (lastline < errstart) || (lastline > fline) || (fcurrent != lastfile)) errorcount = 0; lastline = fline; =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc6.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- embryo_cc_sc6.c 11 Apr 2008 05:59:42 -0000 1.12 +++ embryo_cc_sc6.c 11 Apr 2008 19:06:18 -0000 1.13 @@ -18,7 +18,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc6.c,v 1.12 2008/04/11 05:59:42 doursse Exp $ + * Version: $Id: embryo_cc_sc6.c,v 1.13 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc7.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- embryo_cc_sc7.c 4 Nov 2005 08:16:24 -0000 1.8 +++ embryo_cc_sc7.c 11 Apr 2008 19:06:18 -0000 1.9 @@ -35,7 +35,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc7.c,v 1.8 2005/11/04 08:16:24 sebastid Exp $ + * Version: $Id: embryo_cc_sc7.c,v 1.9 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_scexpand.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- embryo_cc_scexpand.c 20 Apr 2004 03:50:11 -0000 1.2 +++ embryo_cc_scexpand.c 11 Apr 2008 19:06:18 -0000 1.3 @@ -10,8 +10,11 @@ * Riemersma) to accept a string as input, instead of a * complete file. */ -#include <assert.h> -#include <stdio.h> + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #include "embryo_cc_sc.h" #define STACKSIZE 16 @@ -31,7 +34,7 @@ c = stack[--top]; else if ((c = *(unsigned char *)source++) == '\0') break; - + /* Push pair on stack or output byte to the output string */ if (c > 127) { =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sclist.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- embryo_cc_sclist.c 11 Apr 2008 05:29:33 -0000 1.7 +++ embryo_cc_sclist.c 11 Apr 2008 19:06:18 -0000 1.8 @@ -21,7 +21,11 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sclist.c,v 1.7 2008/04/11 05:29:33 doursse Exp $ + * Version: $Id: embryo_cc_sclist.c,v 1.8 2008/04/11 19:06:18 doursse Exp $ + */ + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #ifdef HAVE_CONFIG_H =================================================================== RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_scvars.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- embryo_cc_scvars.c 26 Mar 2005 15:21:02 -0000 1.5 +++ embryo_cc_scvars.c 11 Apr 2008 19:06:18 -0000 1.6 @@ -20,9 +20,13 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_scvars.c,v 1.5 2005/03/26 15:21:02 tsauerbeck Exp $ + * Version: $Id: embryo_cc_scvars.c,v 1.6 2008/04/11 19:06:18 doursse Exp $ */ -#include <stdio.h> + +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #include <stdlib.h> /* for _MAX_PATH */ #include "embryo_cc_sc.h" ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs