On Sun, 22 Aug 2010 06:11:40 +0200 (CEST) Vincent Torri <[email protected]>
said:
> > Modified: trunk/eina/src/lib/eina_log.c
> > ===================================================================
> > --- trunk/eina/src/lib/eina_log.c 2010-08-22 01:15:18 UTC (rev 51505)
> > +++ trunk/eina/src/lib/eina_log.c 2010-08-22 01:15:47 UTC (rev 51506)
> > @@ -354,10 +354,11 @@
> > do { \
> > if (!IS_MAIN(pthread_self())) { \
> > fprintf
> > (stderr, \
> > - "ERR: not main thread! current=%lu, main=%lu
> > \n", \
> > - pthread_self(),
> > _main_thread); \
> > - return
> > __VA_ARGS__; \
> > - }
> > \
> > + "ERR: not main thread! current=%lu, main=%lu\n", \
> > + (unsigned long)pthread_self(),
> > \
> > + (unsigned long)_main_thread); \
> > + return __VA_ARGS__; \
> > + } \
> > } while (0)
>
> formatting in the above code
i already fixed formatting ... but just at end - not start. fixed now.
formatting was kind of iffy anyway already
> > # ifdef EFL_HAVE_POSIX_THREADS_SPINLOCK
> > @@ -368,7 +369,7 @@
> > do
> > { \ if (0)
> > { \ fprintf
> > (stderr, "+++LOG LOG_LOCKED! [%s, %lu]\n", \
> > - __FUNCTION__, pthread_self
> > ()); } \
> > + __FUNCTION__, (unsigned long)pthread_self
> > ()); } \
>
> what is the interest of having code with "if (0)" ? (same below)
beats me - was there before. a disable inside the define
> Vincent
>
> > if (EINA_UNLIKELY(_threads_enabled))
> > { \ pthread_spin_lock
> > (&_log_lock); } \ } while (0)
> > @@ -380,7 +381,7 @@
> > if (0)
> > { \ fprintf
> > (stderr, \ "---LOG
> > LOG_UNLOCKED! [%s, %lu]\n", \
> > - __FUNCTION__, pthread_self
> > ()); } \
> > + __FUNCTION__, (unsigned long)pthread_self
> > ()); } \ } while (0)
> > # define INIT() pthread_spin_init(&_log_lock, PTHREAD_PROCESS_PRIVATE)
> > # define SHUTDOWN() pthread_spin_destroy(&_log_lock)
> > @@ -777,7 +778,7 @@
> > if (IS_OTHER(cur))
> > {
> > fprintf(fp, "%s:%s[T:%lu] %s:%d %s() ",
> > - name, d->domain_str, cur, file, line, fnc);
> > + name, d->domain_str, (unsigned long)cur, file, line, fnc);
> > return;
> > }
> >
> > @@ -799,7 +800,7 @@
> > if (IS_OTHER(cur))
> > {
> > fprintf(fp, "%s:%s[T:%lu] %s() ",
> > - name, d->domain_str, cur, fnc);
> > + name, d->domain_str, (unsigned long)cur, fnc);
> > return;
> > }
> >
> > @@ -821,7 +822,7 @@
> > if (IS_OTHER(cur))
> > {
> > fprintf(fp, "%s:%s[T:%lu] %s:%d ",
> > - name, d->domain_str, cur, file, line);
> > + name, d->domain_str, (unsigned long)cur, file, line);
> > return;
> > }
> >
> > @@ -883,7 +884,8 @@
> > fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:"
> > EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d "
> > EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
> > - color, name, d->domain_str, cur, file, line, fnc);
> > + color, name, d->domain_str, (unsigned long)cur, file,
> > + line, fnc);
> > # endif
> > return;
> > }
> > @@ -951,7 +953,7 @@
> > fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:"
> > EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] "
> > EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
> > - color, name, d->domain_str, cur, fnc);
> > + color, name, d->domain_str, (unsigned long)cur, fnc);
> > # endif
> > return;
> > }
> > @@ -1013,7 +1015,7 @@
> > # else
> > fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:"
> > EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d ",
> > - color, name, d->domain_str, cur, file, line);
> > + color, name, d->domain_str, (unsigned long)cur, file,
> > line);
> > # endif
> > return;
> > }
> > @@ -2246,7 +2248,8 @@
> > cur = SELF();
> > if (IS_OTHER(cur))
> > {
> > - fprintf(f, "%s[T:%lu] %s:%d %s() ", d->name, cur, file, line,
> > fnc);
> > + fprintf(f, "%s[T:%lu] %s:%d %s() ", d->name, (unsigned long)
> > cur,
> > + file, line, fnc);
> > goto end;
> > }
> > }
> >
> >
> > ------------------------------------------------------------------------------
> > This SF.net email is sponsored by
> >
> > Make an app they can't live without
> > Enter the BlackBerry Developer Challenge
> > http://p.sf.net/sfu/RIM-dev2dev
> > _______________________________________________
> > enlightenment-svn mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
> >
> >
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by
>
> Make an app they can't live without
> Enter the BlackBerry Developer Challenge
> http://p.sf.net/sfu/RIM-dev2dev
> _______________________________________________
> enlightenment-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
------------- Codito, ergo sum - "I code, therefore I am" --------------
The Rasterman (Carsten Haitzler) [email protected]
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
