[PATCH 1/4] os/log: Pull LogMessageTypeVerbString out of LogVMessageVerb

Peter Hutterer peter.hutterer at who-t.net
Wed Jul 27 15:32:09 PDT 2011


On Wed, Jul 27, 2011 at 03:03:46PM +0800, Daniel Kurtz wrote:
> On Jul 27, 2011 1:32 PM, "Peter Hutterer" <peter.hutterer at who-t.net> wrote:
> >
> > On Wed, Jul 27, 2011 at 12:03:33PM +0800, Daniel Kurtz wrote:
> > > Also, optimize how the type and format strings are combined.
> > >
> > > Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
> > > ---
> > >  os/log.c |  111 ++++++++++++++++++++++++++++++++++---------------------------
> > >  1 files changed, 62 insertions(+), 49 deletions(-)
> > >
> > > diff --git a/os/log.c b/os/log.c
> > > index 4a310e6..93d4763 100644
> > > --- a/os/log.c
> > > +++ b/os/log.c
> > > @@ -165,6 +165,9 @@ asm (".desc ___crashreporter_info__, 0x10");
> > >  #ifndef X_NOT_IMPLEMENTED_STRING
> > >  #define X_NOT_IMPLEMENTED_STRING     "(NI)"
> > >  #endif
> > > +#ifndef X_NONE_STRING
> > > +#define X_NONE_STRING                   ""
> > > +#endif
> > >
> > >  /*
> > >   * LogInit is called to start logging to a file.  It is also called (with
> > > @@ -323,58 +326,68 @@ LogWrite(int verb, const char *f, ...)
> > >      va_end(args);
> > >  }
> > >
> > > -void
> > > -LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
> > > +/* Returns the Message Type string to prepend to a logging message, or NULL
> > > + * if the message will not be dropped due to insufficient verbosity. */
> >
> > s/not// I guess?
> 
> Yes.  Good catch.  Must I resubmit, or can this be fixed by the committer?

I'll just merge them into my tree, don't worry about it.

Cheers,
  Peter


More information about the xorg-devel mailing list