March 2008 - Libsmi - lists.ibr.cs.tu-bs.de

*diff*
by Yigal Hochberg 04 Mar '08

04 Mar '08

Frank, Juergen, Additional patch for win/makefile in the attempt to build with msdev cl compiler/linker. Please note: 1. This makefile relies on ../winmissing subdir with strtof.c file in it. 2. The patch for lib/smi.h.in by Andrew Hood <ajhood(a)fl.net.au> also needed. Thank you, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/ diff -c "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile.~3~" "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile" *** c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile.~3~ Mon Mar 3 06:58:05 2008 --- c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile Mon Mar 3 23:17:06 2008 *************** *** 65,76 **** ## ## Global makefile settings ## ! W_MISSING = \ $(TMPDIR)\strtof.obj - # $(TMPDIR)\c-strtold.obj \ - # $(TMPDIR)\xstrdup.obj - LIBSMIOBJS = \ $(TMPDIR)\win.obj \ --- 65,73 ---- ## ## Global makefile settings ## ! W_MISSING = \ $(TMPDIR)\strtof.obj LIBSMIOBJS = \ $(TMPDIR)\win.obj \ *************** *** 120,137 **** $(TMPDIR)\dump-xsd.obj \ $(TMPDIR)\dump-sppi.obj \ $(TMPDIR)\dump-sizes.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\fprint.obj \ $(TMPDIR)\rea.obj \ - $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\fortopat.obj - # dmh-change - # Sat Aug 25 2007 dmh software, removed because of lack for fabsf() in ms - # $(TMPDIR)\dump-svg.obj - - SMIDIFFOBJS = \ $(TMPDIR)\smidiff.obj \ $(W_MISSING) --- 117,129 ---- $(TMPDIR)\dump-xsd.obj \ $(TMPDIR)\dump-sppi.obj \ $(TMPDIR)\dump-sizes.obj \ + $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\fprint.obj \ $(TMPDIR)\rea.obj \ $(TMPDIR)\fortopat.obj SMIDIFFOBJS = \ $(TMPDIR)\smidiff.obj \ $(W_MISSING) Diff finished at Mon Mar 03 23:29:15 ....................

4 7

*diff* smi.c
by Yigal Hochberg 04 Mar '08

04 Mar '08

Juergen, Frank, Below are Libsmi I made to be able to build libsmi with cl msdev windows. More to come. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/smi.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/smi.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/smi.c.~1~ Thu Feb 28 21:34:01 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/smi.c Sat Mar 1 16:59:51 2008 *************** *** 1082,1096 **** return &attributePtr->export; } ! SmiType *smiGetAttributeParentType(SmiAttribute *smiAttributePtr) { ! if (!smiAttributePtr) { return NULL; } ! Type *parentTypePtr = ((Attribute*)smiAttributePtr)->parentTypePtr; if(parentTypePtr) return &parentTypePtr->export; --- 1082,1096 ---- return &attributePtr->export; } ! SmiType *smiGetAttributeParentType(SmiAttribute *smiAttributePtr) { ! Type *parentTypePtr; if (!smiAttributePtr) { return NULL; } ! parentTypePtr = ((Attribute*)smiAttributePtr)->parentTypePtr; if(parentTypePtr) return &parentTypePtr->export; *************** *** 1100,1110 **** SmiClass *smiGetAttributeParentClass( SmiAttribute *smiAttributePtr) { if (!smiAttributePtr) { return NULL; } ! Class *parentClassPtr=((Attribute*)smiAttributePtr)->parentClassPtr; if(parentClassPtr) return &parentClassPtr->export; --- 1100,1112 ---- SmiClass *smiGetAttributeParentClass( SmiAttribute *smiAttributePtr) { + Class *parentClassPtr; + if (!smiAttributePtr) { return NULL; } ! parentClassPtr=((Attribute*)smiAttributePtr)->parentClassPtr; if(parentClassPtr) return &parentClassPtr->export; *************** *** 1914,1920 **** char *smiRenderValue(SmiValue *smiValuePtr, SmiType *smiTypePtr, int flags) { ! int i, j, k, n, pfx, have_pfx; char *last_fmt, *fmt; SmiUnsigned64 vv; int xlen; --- 1916,1923 ---- char *smiRenderValue(SmiValue *smiValuePtr, SmiType *smiTypePtr, int flags) { ! unsigned int i, pfx; ! int j, k, n, have_pfx; char *last_fmt, *fmt; SmiUnsigned64 vv; int xlen; Diff finished at Sun Mar 02 12:27:18 ....................

3 6

*diff* smixlate.c
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi driver changes I made to be fix cl msdev compiler warning, and fix c99/c issues. (please note: cl is no c99 compatible) Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/smixlate.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/smixlate.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/smixlate.c.~1~ Thu Feb 28 21:34:02 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/smixlate.c Sun Mar 2 12:19:30 2008 *************** *** 38,44 **** SmiNode *smiNode; SmiSubid oid[256]; unsigned int oidlen = 0; ! int i; char *p; assert(token && subst); --- 38,44 ---- SmiNode *smiNode; SmiSubid oid[256]; unsigned int oidlen = 0; ! unsigned int i; char *p; assert(token && subst); Diff finished at Sun Mar 02 13:23:47 ....................

1 0

*diff* fortopat.c
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi driver changes I made to be fix cl msdev compiler warning, and fix c99/c issues. (please note: cl is no c99 compatible) More to come. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/fortopat.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/fortopat.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/fortopat.c.~1~ Thu Feb 28 21:34:02 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/fortopat.c Sat Mar 1 10:54:23 2008 *************** *** 401,406 **** --- 401,408 ---- unsigned int i = 0; char *ret = lengths[ i ] ? "(" : "(("; char *r2 = getKnownDisplayHint_XSD( hint, lengths, numSubranges ); + DH *dh; + int bl = 0; r2 = NULL; *************** *** 413,420 **** if( numSubranges > 1 ) fputs( "MORE_SUBRANGES\n", stdout );*/ return r2; } ! DH *dh = parseDH( hint ); ! int bl = 0; if(! dh ) return NULL; --- 415,422 ---- if( numSubranges > 1 ) fputs( "MORE_SUBRANGES\n", stdout );*/ return r2; } ! ! dh = parseDH( hint ); if(! dh ) return NULL; Diff finished at Sun Mar 02 13:22:14 ....................

1 0

*diff* dump-svg.c
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi driver changes I made to be fix cl msdev compiler warning, and fix c99/c issues. (please note: cl is no c99 compatible) More to come. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-svg.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-svg.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-svg.c.~1~ Thu Feb 28 21:34:02 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-svg.c Sat Mar 1 16:45:46 2008 *************** *** 24,29 **** --- 24,30 ---- #include <math.h> #ifdef HAVE_WIN_H #include "win.h" + #include "ms_mapping.h" /* for fabsf(), fabs() */ #endif #include "smi.h" Diff finished at Sun Mar 02 13:19:14 ....................

1 0

*diff* dump-sming.c
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi driver changes I made to be fix cl msdev compiler warning, and fix c99/c issues. (please note: cl is no c99 compatible) More to come. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-sming.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-sming.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-sming.c.~1~ Thu Feb 28 21:34:02 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/tools/dump-sming.c Sat Mar 1 12:55:53 2008 *************** *** 478,484 **** int n; unsigned int i; SmiNamedNumber *nn; ! SmiNode *nodePtr; s[0] = 0; --- 478,484 ---- int n; unsigned int i; SmiNamedNumber *nn; ! /*SmiNode *nodePtr;*/ s[0] = 0; *************** *** 834,840 **** static void fprintIdentities(FILE *f, SmiModule *smiModule) { ! int i, j; SmiIdentity *smiIdentity; SmiIdentity *tmpIdentity; --- 834,841 ---- static void fprintIdentities(FILE *f, SmiModule *smiModule) { ! int i; ! /*int j;*/ SmiIdentity *smiIdentity; SmiIdentity *tmpIdentity; *************** *** 876,882 **** static void fprintExtensions(FILE *f, SmiModule *smiModule) { ! int i, j; SmiMacro *smiMacro; for(i = 0, smiMacro = smiGetFirstMacro(smiModule); --- 877,884 ---- static void fprintExtensions(FILE *f, SmiModule *smiModule) { ! int i; ! /*int j;*/ SmiMacro *smiMacro; for(i = 0, smiMacro = smiGetFirstMacro(smiModule); *************** *** 944,950 **** } static void fprintAttributes(FILE *f, SmiClass *smiClass) { ! int i, j; SmiAttribute *smiAttribute; SmiType *tmpType; SmiClass *tmpClass; --- 946,953 ---- } static void fprintAttributes(FILE *f, SmiClass *smiClass) { ! int i; ! /*int j;*/ SmiAttribute *smiAttribute; SmiType *tmpType; SmiClass *tmpClass; *************** *** 1026,1032 **** static void fprintEvents(FILE *f, SmiClass *smiClass) { ! int i, j; SmiEvent *smiEvent; for(i = 0, smiEvent = smiGetFirstEvent(smiClass); --- 1029,1036 ---- static void fprintEvents(FILE *f, SmiClass *smiClass) { ! int i; ! /*int j;*/ SmiEvent *smiEvent; for(i = 0, smiEvent = smiGetFirstEvent(smiClass); *************** *** 1063,1069 **** static void fprintClasses(FILE *f, SmiModule *smiModule) { ! int i, j; SmiClass *smiClass; SmiClass *tmpClass; --- 1067,1074 ---- static void fprintClasses(FILE *f, SmiModule *smiModule) { ! int i; ! /*int j;*/ SmiClass *smiClass; SmiClass *tmpClass; Diff finished at Sun Mar 02 13:15:37 ....................

1 0

New files to libsmi - missing functions in msdev
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Attached is a open-source file which I added in a new libsmi dir "winmising". This directory is a place holder for functions used by various libsmi drivers Which are missing in msdev env. Regards, Yigal

1 0

*diff* win makefile
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi changes I made to be able to build libsmi with cl msdev windows. Please note that I added a new dir "winmissing" where I put sources for missing functions. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/win/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/win/makefile.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/win/makefile" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/win/makefile.~1~ Thu Feb 28 21:34:00 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/win/makefile Sat Mar 1 16:57:17 2008 *************** *** 5,11 **** # Makefile for VC++ (tested with version 6.0) for compiling # libsmi and associated tools natively under Win32. # ! # Copyright (c) 2000-2003 Yigal Hochberg, DMH Software. # Copyright (c) 2000 E. Schoenfelder, Gaertner Datensysteme Braunschweig. # Copyright (c) 2000 J. Schoenwaelder, Technical University of Braunschweig. # --- 5,11 ---- # Makefile for VC++ (tested with version 6.0) for compiling # libsmi and associated tools natively under Win32. # ! # Copyright (c) 2000-2008 Yigal Hochberg, DMH Software. # Copyright (c) 2000 E. Schoenfelder, Gaertner Datensysteme Braunschweig. # Copyright (c) 2000 J. Schoenwaelder, Technical University of Braunschweig. # *************** *** 65,70 **** --- 65,77 ---- ## ## Global makefile settings ## + W_MISSING = \ + $(TMPDIR)\strtof.obj + + # $(TMPDIR)\c-strtold.obj \ + # $(TMPDIR)\xstrdup.obj + + LIBSMIOBJS = \ $(TMPDIR)\win.obj \ $(TMPDIR)\shhopt.obj \ *************** *** 80,93 **** $(TMPDIR)\snprintf.obj SMIQUERYOBJS = \ ! $(TMPDIR)\smiquery.obj SMILINTOBJS = \ ! $(TMPDIR)\smilint.obj SMIXLATEOBJS = \ $(TMPDIR)\smixlate.obj \ ! $(TMPDIR)\dstring.obj SMIDUMPOBJS = \ $(TMPDIR)\smidump.obj \ --- 87,103 ---- $(TMPDIR)\snprintf.obj SMIQUERYOBJS = \ ! $(TMPDIR)\smiquery.obj \ ! $(W_MISSING) SMILINTOBJS = \ ! $(TMPDIR)\smilint.obj \ ! $(W_MISSING) SMIXLATEOBJS = \ $(TMPDIR)\smixlate.obj \ ! $(TMPDIR)\dstring.obj \ ! $(W_MISSING) SMIDUMPOBJS = \ $(TMPDIR)\smidump.obj \ *************** *** 113,122 **** $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\fprint.obj \ ! $(TMPDIR)\rea.obj SMIDIFFOBJS = \ ! $(TMPDIR)\smidiff.obj SMILIB = smi.lib --- 123,135 ---- $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\fprint.obj \ ! $(TMPDIR)\rea.obj \ ! $(TMPDIR)\dump-yang.obj \ ! $(TMPDIR)\fortopat.obj SMIDIFFOBJS = \ ! $(TMPDIR)\smidiff.obj \ ! $(W_MISSING) SMILIB = smi.lib *************** *** 135,140 **** --- 148,158 ---- $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< + {$(ROOT)\winmissing}.c.obj: + $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ + $(DEFINES) -Fo$(TMPDIR)\ $< + + ## ## Targets ## *************** *** 167,173 **** smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ ! /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ --- 185,191 ---- smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ ! /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) strtof.obj smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ *************** *** 226,229 **** --- 244,257 ---- $(MKDIR) $(PIBDIR)\site + # + # Local Variables: + # mode: makefile + # make: "nmake" + # eval: (set (make-local-variable 'this-file) (file-name-nondirectory buffer-file-name)) + # eval: (set (make-local-variable 'compile-command) (concat make " -k -f " this-file)) + # End: + # + + # EOF: makefile Diff finished at Sun Mar 02 13:01:29 ....................

1 0

c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/ms_mapping.h
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below is c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/ms_mapping.h I added this file in the lib dir. It is included by parser-sming.c:242:#include "ms_mapping.h" /* dmh */ Maybe not the most elegant way to deal with missing msdev functions. Thank you. -- - Yigal ===File c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/ms_mapping.h=== /* Last edit: Sat Mar 01 12:29:10 2008 * By: Yigal Hochberg */ /** * \file ms_mapping.h * * \brief Mapping C99 functions to stdlib functions for lib smi parser * * \author Yigal Hochberg, DMH Software * * \date Sat Mar 01 2008 * * \version $Id$ */ #ifndef MS_MAPPING_H #define MS_MAPPING_H #define strtold strtod #define strtodf strtof #define fabsf fabs #endif /* MS_MAPPING_H */ /* EOF: ms_mapping.h */ ============================================================

1 0

*diff* parser-sming.c
by Yigal Hochberg 02 Mar '08

02 Mar '08

Juergen, Frank, Below are Libsmi changes I made to be able to build libsmi with cl msdev windows. More to come. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/ diff -c "c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/parser-sming.c.~1~" "c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/parser-sming.c" *** c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/parser-sming.c.~1~ Thu Feb 28 21:55:22 2008 --- c:/yigal/dmh-libsmi/libsmi-0.4.6/lib/parser-sming.c Sat Mar 1 11:46:59 2008 *************** *** 239,244 **** --- 239,245 ---- #if defined(_MSC_VER) #include <malloc.h> + #include "ms_mapping.h" /* dmh */ #endif #include "smi.h" *************** *** 489,496 **** char* res =(char*)malloc(sizeof(char)*len/2+1); char* tmp =(char*)malloc(sizeof(char)*3); - tmp[2]=0; int i,j = 0; for(i=2; i+1<len; i+=2) { tmp[0]= hexStr[i]; --- 490,498 ---- char* res =(char*)malloc(sizeof(char)*len/2+1); char* tmp =(char*)malloc(sizeof(char)*3); int i,j = 0; + + tmp[2]=0; for(i=2; i+1<len; i+=2) { tmp[0]= hexStr[i]; Diff finished at Sun Mar 02 12:41:55 ....................

1 0