evlog-gcc.patch

   1 --- evlog-1.6.1/user/include/evl_template.h.orig        2004-04-30 02:22:59.000000000 +0200
   2 +++ evlog-1.6.1/user/include/evl_template.h     2013-03-23 13:24:16.339328531 +0100
   3 @@ -469,7 +469,7 @@
   4  extern void _evlTmplSemanticError(const char *fmt, ...);
   5  extern tmpl_type_info_t _evlTmplTypeInfo[];
   6
   7 -extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][];
   8 +extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][24];
   9
  10  extern void _evlTmplDprintf(const char *fmt, ...);
  11  extern int _evlEndsWith(const char *s, const char *suffix);
  12 --- evlog-1.6.1/user/lib/template/convert.c.orig        2004-12-15 18:05:46.000000000 +0100
  13 +++ evlog-1.6.1/user/lib/template/convert.c     2013-03-23 13:50:39.955928813 +0100
  14 @@ -244,7 +244,7 @@
  15                                 memcpy(data, tmp, dest_size);
  16                         }
  17                         break;
  18 -    default:
  19 +    default: ;
  20         }
  21  }
  22
  23 --- evlog-1.6.1/user/lib/util/format.c.orig     2004-04-30 02:27:56.000000000 +0200
  24 +++ evlog-1.6.1/user/lib/util/format.c  2013-03-23 14:14:53.439201281 +0100
  25 @@ -286,7 +286,7 @@
  26                 seg->u.fs_attname = nsaName;
  27                 seg->u2.fs_attribute = NULL;
  28                 break;
  29 -  default:
  30 +  default: ;
  31         }
  32         seg->fs_userfmt = attrFmt;
  33         if (attrFmt
  34 @@ -475,7 +475,7 @@
  35                          */
  36                         size += _evlGetMaxDumpLen();
  37                         break;
  38 -    default:
  39 +    default: ;
  40                 }
  41                 p = p->li_next;
  42         } while (p != head);
  43 @@ -667,7 +667,7 @@
  44         case TY_INT:            return TY_UINT;
  45         case TY_LONG:           return TY_ULONG;
  46         case TY_LONGLONG:       return TY_ULONGLONG;
  47 -  default:
  48 +  default: ;
  49         }
  50         return ty;
  51  }
  52 --- evlog-1.6.1/user/include/evlog.h.in.orig    2013-03-23 14:26:33.832505085 +0100
  53 +++ evlog-1.6.1/user/include/evlog.h.in 2013-03-23 19:46:44.581698880 +0100
  54 @@ -191,8 +191,6 @@
  55     char file[128];
  56  };
  57
  58 -#define _EVLOG_POS { __LINE__, __FUNCTION__, __FILE__ }
  59 -
  60  struct evlog_info {
  61     char format[128+64];
  62     char facility[64];
  63 @@ -202,7 +200,8 @@
  64  #define syslogat(priority, fmt, ...) \
  65      do { \
  66         static struct evlog_info __attribute__((section(".log"),unused)) ___ \
  67 -               = { fmt, __stringify(EVL_FACILITY_NAME), _EVLOG_POS }; \
  68 +               = { fmt, __stringify(EVL_FACILITY_NAME) }; \
  69 +           ___.pos.line = __LINE__; strncpy(___.pos.function, 60, __FUNCTION__); strncpy(___.pos.file, 128, __FILE__); \
  70         char *unbraced_fmt = _evl_unbrace(fmt); \
  71         if (_evl_syslogat(priority, __stringify(EVL_FACILITY_NAME), \
  72             evl_gen_event_type(__FILE__, __FUNCTION__, fmt), \