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

Re: [libsmi] *diff*: win/makefile
by Yigal Hochberg 24 Mar '08

24 Mar '08

Hi Juergen, The duplication probably happened by svn merge. I will try svn diff in the future. Thank you. Regards, > On: Mon, 24 Mar 2008 12:22:51 +0100 > Juergen Schoenwaelder <j.schoenwaelder(a)jacobs-university.de> wrote: > > On Mon, Mar 24, 2008 at 07:10:06AM -0400, Yigal Hochberg wrote: > > > > Frank, Juergen, > > > > A small diff for win/makefile. dump-boilerplate.obj appeared twice. > > Not in the SVN as far as I can tell. > > It will make things simpler if you can send in 'svn diff' diffs since > then it becomes clear against which revision the diff is. > > /js > > -- > Juergen Schoenwaelder Jacobs University Bremen gGmbH > Phone: +49 421 200 3587 Campus Ring 1, 28759 Bremen, Germany > Fax: +49 421 200 3103 <http://www.jacobs-university.de/> > -- > !! This message is brought to you via the `libsmi' mailing list. > !! Please do not reply to this message to unsubscribe. To unsubscribe or adjust > !! your settings, send a mail message to <libsmi-request(a)ibr.cs.tu-bs.de> > !! or look at https://mail.ibr.cs.tu-bs.de/mailman/listinfo/libsmi. -- - Yigal

1 0

*diff*: win/makefile
by Yigal Hochberg 24 Mar '08

24 Mar '08

Frank, Juergen, A small diff for win/makefile. dump-boilerplate.obj appeared twice. 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.~6~" "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile" *** c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile.~6~ Mon Mar 24 07:04:19 2008 --- c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile Mon Mar 24 07:06:06 2008 *************** *** 112,118 **** $(TMPDIR)\dump-sizes.obj \ $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ - $(TMPDIR)\dump-boilerplate.obj \ $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\dump-boilerplate.obj \ $(TMPDIR)\fprint.obj \ --- 112,117 ---- Diff finished at Mon Mar 24 07:08:30 ....................

2 1

version number
by Andrew Hood 16 Mar '08

16 Mar '08

there is a ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/libsmi-0.4.7.tar.gz but subversion still says 0.4.6 -- There's no point in being grown up if you can't be childish sometimes. -- Dr. Who

1 0

*diff* win/makefile
by Yigal Hochberg 05 Mar '08

05 Mar '08

Juergen, Below is a cleaner win/makefile without the missing strtof(). This has to come to the previous patch. Thanks for everyone who helped. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/ diff -c "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile.7827" "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile" *** c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile.7827 Tue Mar 4 20:26:08 2008 --- c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/win/makefile Tue Mar 4 20:18:35 2008 *************** *** 65,76 **** ## ## Global makefile settings ## - W_MISSING = \ - $(TMPDIR)\strtof.obj - - # $(TMPDIR)\c-strtold.obj \ - # $(TMPDIR)\xstrdup.obj - LIBSMIOBJS = \ $(TMPDIR)\win.obj \ --- 65,70 ---- *************** *** 88,103 **** 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 \ --- 82,94 ---- *************** *** 122,135 **** $(TMPDIR)\dump-sizes.obj \ $(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 --- 113,125 ---- $(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 \ SMILIB = smi.lib *************** *** 185,191 **** smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ ! /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) strtof.obj smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ --- 175,181 ---- smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ ! /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ Diff finished at Tue Mar 04 20:27:03 ....................

1 0

*diff* lib/parser-sming.y
by Yigal Hochberg 05 Mar '08

05 Mar '08

Juergen, I added the following lines to parser-sming.y. This is suggested by Andrew Hood <ajhood(a)fl.net.au>. It works ok. Thank you Andrew. BTW: the compiler I use is Compiler Version 12.00.8804 for 80x86 (meaning _MSC_VER = 1200) I will follow up with a "clean" win/makefile. Regards, -- - Yigal .................... cd c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/lib/ diff -c "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/lib/parser-sming.y.~1~" "c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/lib/parser-sming.y" *** c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/lib/parser-sming.y.~1~ Mon Mar 3 06:58:10 2008 --- c:/yigal/dmh-libsmi/libsmi-svn/libsmi/trunk/lib/parser-sming.y Tue Mar 4 20:06:02 2008 *************** *** 29,34 **** --- 29,37 ---- #if defined(_MSC_VER) #include <malloc.h> + #if _MSC_VER <= 1200 + #define strtof(f1,f2) ((float)strtod(f1,f2)) + #endif #endif #ifdef HAVE_WIN_H Diff finished at Tue Mar 04 20:12:11 ....................

1 0

*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