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

Readme updates
by Anders Broman 17 Apr '08

17 Apr '08

Index: README.win =================================================================== --- README.win (revision 8072) +++ README.win (working copy) @@ -20,8 +20,8 @@ Installation ============ -(1) Change the compiler path macro TOOLS32 in ./makefile for the - specific msvc installation. +(1) Set MSVC version used in ./config.nmake. Check the compiler path + macro TOOLS32 in ./config.nmake for the specific msvc installation. (2) To compile simply run @@ -72,7 +72,7 @@ by their 64bit _int64 msvc counterparts. They work ok. see related definitions ./config.h -- The compiler path in ./makefile is hardwired (TOOLS32) +- The compiler path in ./config.nmake is hardwired (TOOLS32) - The installation directories are hardwired in config.h.in

1 0

Re: [Wireshark-dev] Building libsmi from SVN as a .dll
by Andrew Hood 17 Apr '08

17 Apr '08

Anders Broman wrote: > Hi, > I have experemented with building libsmi.dll from libsmi SVN > _http://www.ibr.cs.tu-bs.de/svn/libsmi_ with the included makefile-dll > and smi.def file > > It builds under MSVC6 I have not tested it but if some one likes to play > with it - here it is... > If you find any errors please let me know. I've managed to get your makefile to work with MSVC8. My version attached. A few more -Dxxx make the compiler and linker happy. Adding smiFree to smi.h and EXPORTing it from the DLL lets the memory that is currently being leaked be freed. Juergen agrees this is OK. If have added these to smi.h and EXPORTed them: extern void *smiMalloc(size_t size); extern void *smiRealloc(void *ptr, size_t size); extern char *smiStrdup(const char *s1); extern char *smiStrndup(const char *s1, size_t n); extern void smiFree(void *ptr); I think I have also tracked down one of the reasons wireshark crashes. Take this snippet: ICS3-MIB DEFINITIONS ::= BEGIN IMPORTS OBJECT-TYPE FROM RFC-1212 TRAP-TYPE FROM RFC-1215 westellInterchangeProducts FROM WESTELL-GENERAL-MIB; ics3 OBJECT IDENTIFIER ::= { westellInterchangeProducts 2 2 } smilint gives this warning. ./ICS3-MIB:16: warning: implicit node definition At line 595 oids.c calls smiRenderOID to format the node. The implicit node is not completely filled in, and wireshark/tshark crashes in libsmi. This is not totally unreasonable since implicit nodes should never be seen. Adding: if (kind == OID_KIND_UNKNOWN) continue; (you will have to separate the declarations and initialisations of oid and oid_data) before that call stops the crash. -- There's no point in being grown up if you can't be childish sometimes. -- Dr. Who # # makefile -- # # 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. # # See the file "COPYING" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # @(#) $Id: makefile 3226 2006-02-27 21:48:23Z schoenw $ ## ## Project directories -- these may need to be customized for your site ## ## ROOT -- top of the source tree. ## TMPDIR -- location for .obj files. ## TOOLS32 -- location of VC++ compiler installation. ## ROOT = .\.. TMPDIR = . #TOOLS32 = C:\MSDEV #TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 TOOLS32 = "C:\Program Files\Microsoft Visual Studio 8\VC" ## ## Installation paths: ## ## MIBROOT -- definition for default search path (unix-style) ## MIBDIR -- same in windows style ## PIBDIR -- same in windows style ## BINDIR -- destination for the binaries (smidump.exe, ...) ## LIBDIR -- destination for the library (smi.lib) ## MIBROOT = c:/usr/local/snmp/mibs PIBROOT = c:/usr/local/snmp/pibs INSTROOT = c:\usr\local MIBDIR = $(INSTROOT)\snmp\mibs PIBDIR = $(INSTROOT)\snmp\pibs BINDIR = $(INSTROOT)\wbin LIBDIR = $(INSTROOT)\wbin ## ## Visual C++ tools ## PATH=$(TOOLS32)\bin;$(PATH) cc32 = cl CP = copy RM = del MKDIR = -mkdir ## ## Definitions: ## # DEBUG = -W3 -Zi -Od /Yd DEBUG = /W3 /Zi /Od /DEBUG /GS /Wp64 /Yd INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 !include <win32.mak> ## ## Global makefile settings ## LIBSMIOBJS = \ $(TMPDIR)\win.obj \ $(TMPDIR)\shhopt.obj \ $(TMPDIR)\data.obj \ $(TMPDIR)\check.obj \ $(TMPDIR)\error.obj \ $(TMPDIR)\util.obj \ $(TMPDIR)\smi.obj \ $(TMPDIR)\parser-smi.obj \ $(TMPDIR)\scanner-smi.obj \ $(TMPDIR)\parser-sming.obj \ $(TMPDIR)\scanner-sming.obj \ $(TMPDIR)\snprintf.obj SMIQUERYOBJS = \ $(TMPDIR)\smiquery.obj \ SMILINTOBJS = \ $(TMPDIR)\smilint.obj \ SMIXLATEOBJS = \ $(TMPDIR)\smixlate.obj \ $(TMPDIR)\dstring.obj \ SMIDUMPOBJS = \ $(TMPDIR)\smidump.obj \ $(TMPDIR)\dump-sming.obj \ $(TMPDIR)\dump-smi.obj \ $(TMPDIR)\dump-imports.obj \ $(TMPDIR)\dump-types.obj \ $(TMPDIR)\dump-tree.obj \ $(TMPDIR)\dump-mosy.obj \ $(TMPDIR)\dump-corba.obj \ $(TMPDIR)\dump-netsnmp.obj \ $(TMPDIR)\dump-jax.obj \ $(TMPDIR)\dump-xml.obj \ $(TMPDIR)\dump-cm.obj \ $(TMPDIR)\dump-metrics.obj \ $(TMPDIR)\dump-identifiers.obj \ $(TMPDIR)\dump-python.obj \ $(TMPDIR)\dump-perl.obj \ $(TMPDIR)\dump-scli.obj \ $(TMPDIR)\dump-xsd.obj \ $(TMPDIR)\dump-sppi.obj \ $(TMPDIR)\dump-sizes.obj \ $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\dump-boilerplate.obj \ $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\fprint.obj \ $(TMPDIR)\rea.obj \ $(TMPDIR)\fortopat.obj SMIDIFFOBJS = \ $(TMPDIR)\smidiff.obj \ SMILIB = smi.lib SMIDLL = smi.dll ## ## Implicit Targets ## .c.obj: $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\lib}.c{$(TMPDIR)}.obj: $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD $(INCLUDES) \ -DYYMALLOC=malloc -DYYFREE=free \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\tools}.c{$(TMPDIR)}.obj: $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< ## ## Targets ## all: libs tools libs: $(SMILIB) $(SMIDLL) # special compilation rules # (flex-src avoids missing unistd.h if _Win32 defined) # $(TMPDIR)\scanner-smi.obj : $(ROOT)\lib\scanner-smi.c $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD -D_Win32 -D__STDC__ $(INCLUDES) \ -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(TMPDIR)\scanner-sming.obj : $(ROOT)\lib\scanner-sming.c $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD -D_Win32 -D__STDC__ $(INCLUDES) \ -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(SMIDLL): $(SMILIB) # $(link) -entry:_DllMainCRTStartup@12 -dll /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO msvcrt.lib oldnames.lib kernel32.lib ws2_32.lib shell32.lib /DEF:smi.def /OUT:$(SMIDLL) /IMPLIB:$(SMILIB) $(LIBSMIOBJS) link $(dlllflags) $(conlibsdll) /NODEFAULTLIB /machine:i386 msvcrt.lib shell32.lib version.lib /DEBUG /DEF:smi.def /OUT:smi.dll /IMPLIB:smi.lib $(LIBSMIOBJS) $(SMILIB): $(LIBSMIOBJS) $(implib) /out:smi.lib $(LIBSMIOBJS) tools: smiquery.exe smilint.exe smixlate.exe smidump.exe smidiff.exe smiquery.exe: $(SMIQUERYOBJS) $(SMILIB) $(cc32) $(DEFINES) /osmiquery.exe $(SMIQUERYOBJS) $(SMILIB) smilint.exe: $(SMILINTOBJS) $(SMILIB) $(cc32) $(DEFINES) /osmilint.exe $(SMILINTOBJS) $(SMILIB) smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmidiff.exe $(SMIDIFFOBJS) $(SMILIB) smixlate.exe: $(SMIXLATEOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmixlate.exe $(SMIXLATEOBJS) $(SMILIB) clean: rm -f *.lib rm -f *.obj rm -f *.exe rm -f *.ilk rm -f *.pdb rm -f *.mdp install: all install-doc install-bin install-lib install-mibs install-pibs install-doc: $(MKDIR) $(INSTROOT) $(CP) ..\README $(INSTROOT) $(CP) ..\COPYING $(INSTROOT) $(CP) README.win $(INSTROOT) $(MKDIR) $(INSTROOT)\doc $(CP) ..\doc\*.txt $(INSTROOT)\doc $(CP) ..\doc\*.ps $(INSTROOT)\doc install-bin: $(MKDIR) $(BINDIR) $(CP) *.exe $(BINDIR) install-lib: $(MKDIR) $(LIBDIR) $(CP) *.lib $(LIBDIR) install-mibs: $(MKDIR) $(MIBDIR) $(MKDIR) $(MIBDIR)\iana $(CP) ..\mibs\iana\*.* $(MIBDIR)\iana $(MKDIR) $(MIBDIR)\ietf $(CP) ..\mibs\ietf\*.* $(MIBDIR)\ietf $(MKDIR) $(MIBDIR)\irtf $(CP) ..\mibs\irtf\*.* $(MIBDIR)\irtf $(MKDIR) $(MIBDIR)\tubs $(CP) ..\mibs\tubs\*.* $(MIBDIR)\tubs $(MKDIR) $(MIBDIR)\site install-pibs: $(MKDIR) $(PIBDIR) $(MKDIR) $(PIBDIR)\ietf $(CP) ..\pibs\ietf\*.* $(PIBDIR)\ietf $(MKDIR) $(PIBDIR)\tubs $(CP) ..\pibs\tubs\*.* $(PIBDIR)\tubs $(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

2 4

ITU mibs
by Anders Broman 16 Apr '08

16 Apr '08

Would it be possible to get the following ITU mibs added to the mib repositorry? <<h341.mib.zip>> Reagrds Anders

2 1

First stepps to make it possible to build libsmi as a .dll
by Anders Broman 16 Apr '08

16 Apr '08

Hi, Included patches to split makefile Into config.nmake and makefile add add a smi.def file needed when building a .dll If this is acceptable I will try to make a common makefile for both options (.exe vs .dll). Regards Anders Index: config.nmake =================================================================== --- config.nmake (revision 0) +++ config.nmake (revision 0) @@ -0,0 +1,50 @@ +# $Id$ +# +# +# + +## +## Project directories -- these may need to be customized for your site +## +## ROOT -- top of the source tree. +## TMPDIR -- location for .obj files. +## TOOLS32 -- location of VC++ compiler installation. +## +ROOT = .\.. +TMPDIR = . +#TOOLS32 = C:\MSDEV +TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 + +## +## Installation paths: +## +## MIBROOT -- definition for default search path (unix-style) +## MIBDIR -- same in windows style +## PIBDIR -- same in windows style +## BINDIR -- destination for the binaries (smidump.exe, ...) +## LIBDIR -- destination for the library (smi.lib) +## +MIBROOT = c:/smi/mibs +PIBROOT = c:/smi/pibs +INSTROOT = c:\smi +MIBDIR = $(INSTROOT)\mibs +PIBDIR = $(INSTROOT)\pibs +BINDIR = $(INSTROOT)\bin +LIBDIR = $(INSTROOT)\lib + +## +## Visual C++ tools +## +PATH=$(TOOLS32)\bin;$(PATH) + +cc32 = cl +CP = copy +RM = del +MKDIR = md + +## +## Definitions: +## +# DEBUG = -W3 -Zi -Od /Yd +INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include +DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 Index: smi.def =================================================================== --- smi.def (revision 0) +++ smi.def (revision 0) @@ -0,0 +1,102 @@ +EXPORTS +optParseOptions +smiInit +smiExit +smiSetErrorLevel +smiGetFlags +smiSetFlags +smiGetPath +smiSetPath +smiSetSeverity +smiReadConfig +smiLoadModule +smiIsLoaded +smiSetErrorHandler +smiGetModule +smiGetFirstModule +smiGetNextModule +smiGetModuleIdentityNode +smiGetFirstImport +smiGetNextImport +smiIsImported +smiGetFirstRevision +smiGetNextRevision +smiGetRevisionLine +smiGetType +smiGetFirstType +smiGetNextType +smiGetParentType +smiGetTypeModule +smiGetTypeLine +smiGetFirstRange +smiGetNextRange +smiGetFirstNamedNumber +smiGetNextNamedNumber +smiGetMacro +smiGetFirstMacro +smiGetNextMacro +smiGetMacroModule +smiGetNode +smiGetNodeByOID +smiGetFirstNode +smiGetNextNode +smiGetParentNode +smiGetRelatedNode +smiGetFirstChildNode +smiGetNextChildNode +smiGetNodeModule +smiGetNodeType +smiGetNodeLine +smiGetFirstElement +smiGetNextElement +smiGetElementNode +smiGetFirstOption +smiGetNextOption +smiGetOptionNode +smiGetOptionLine +smiGetFirstRefinement +smiGetNextRefinement +smiGetRefinementNode +smiGetRefinementType +smiGetRefinementWriteType +smiGetRefinementLine +smiGetFirstUniquenessElement +smiRenderOID +smiRenderValue +smiRenderNode +smiRenderType +smiAsprintf +smiVasprintf +smiGetErrorDescription +smiGetErrorMsg +smiGetErrorTag +smiGetErrorSeverity +smiGetParentIdentity +smiGetNextIdentity +smiGetFirstIdentity +smiGetParentClass +smiGetNextClass +smiGetFirstClass +smiGetNextUniqueAttribute +smiGetFirstUniqueAttribute +smiIsClassScalar +smiGetAttributeParentType +smiGetAttributeParentClass +smiGetNextAttribute +smiGetFirstAttribute +smiGetAttributeNextRange +smiGetAttributeFirstRange +smiGetAttributeNextNamedNumber +smiGetAttributeFirstNamedNumber +smiGetNextEvent +smiGetFirstEvent +smiGetMinSize +smiGetMinSize +smiGetMinSize +smiGetMinSize +smiGetMaxSize +smiGetMaxSize +smiGetMaxSize +smiGetMaxSize +smiGetMinMaxRange +smiGetMinMaxRange Index: makefile =================================================================== --- makefile (revision 8059) +++ makefile (working copy) @@ -13,52 +13,7 @@ # # @(#) $Id$ -## -## Project directories -- these may need to be customized for your site -## -## ROOT -- top of the source tree. -## TMPDIR -- location for .obj files. -## TOOLS32 -- location of VC++ compiler installation. -## -ROOT = .\.. -TMPDIR = . -#TOOLS32 = C:\MSDEV -TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 - -## -## Installation paths: -## -## MIBROOT -- definition for default search path (unix-style) -## MIBDIR -- same in windows style -## PIBDIR -- same in windows style -## BINDIR -- destination for the binaries (smidump.exe, ...) -## LIBDIR -- destination for the library (smi.lib) -## -MIBROOT = c:/smi/mibs -PIBROOT = c:/smi/pibs -INSTROOT = c:\smi -MIBDIR = $(INSTROOT)\mibs -PIBDIR = $(INSTROOT)\pibs -BINDIR = $(INSTROOT)\bin -LIBDIR = $(INSTROOT)\lib - -## -## Visual C++ tools -## -PATH=$(TOOLS32)\bin;$(PATH) - -cc32 = cl -CP = copy -RM = del -MKDIR = md - -## -## Definitions: -## -# DEBUG = -W3 -Zi -Od /Yd -INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include -DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 - +!include "config.nmake" !include <win32.mak> ## @@ -150,11 +105,13 @@ # (flex-src avoids missing unistd.h if _Win32 defined) # $(TMPDIR)\scanner-smi.obj : $(ROOT)\lib\scanner-smi.c - $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(TMPDIR)\scanner-sming.obj : $(ROOT)\lib\scanner-sming.c - $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? @@ -182,12 +139,12 @@ /osmixlate.exe $(SMIXLATEOBJS) $(SMILIB) clean: - del *.lib - del *.obj - del *.exe - del *.ilk - del *.pdb - del *.mdp + rm -f *.lib + rm -f *.obj + rm -f *.exe + rm -f *.ilk + rm -f *.pdb + rm -f *.mdp install: all install-doc install-bin install-lib install-mibs install-pibs

2 3

Problem with vsnprintf and MSVC6
by Anders Broman 15 Apr '08

15 Apr '08

Hi, Would this patch work on unix it works for me on MSVC6: Index: dstring.c =================================================================== --- dstring.c (revision 8016) +++ dstring.c (working copy) @@ -147,7 +147,7 @@ o = ds->len; while (1) { va_copy(ap, _ap); - n = vsnprintf(ds->str + o, ds->len+1 - o, format, ap); + n = _vsnprintf(ds->str + o, ds->len+1 - o, format, ap); va_end(ap); if (n > -1 && n+o <= ds->len) { if (n+o < ds->len) { @@ -186,7 +186,7 @@ if (ds) { while (1) { va_copy(ap, _ap); - n = vsnprintf(ds->str, ds->len+1, format, ap); + n = _vsnprintf(ds->str, ds->len+1, format, ap); va_end(ap); if (n > -1 && n <= ds->len) { if (n < ds->len) { Regards Anders

3 6

When building a .dll the following flags must be added
by Anders Broman 14 Apr '08

14 Apr '08

Index: makefile =================================================================== --- makefile (revision 8042) +++ makefile (working copy) @@ -131,7 +131,7 @@ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\lib}.c{$(TMPDIR)}.obj: - $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -DYYMALLOC=malloc -DYYFREE=free $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\tools}.c{$(TMPDIR)}.obj: Index: win.c

2 1

extern void needed in shhopt.h to build a .dll
by Anders Broman 14 Apr '08

14 Apr '08

Hi, The following patch is needed to build libsmi as a .dll Regards Anders Index: shhopt.h =================================================================== --- shhopt.h (revision 8039) +++ shhopt.h (working copy) @@ -1,4 +1,4 @@ -/* $Id: shhopt.h,v 1.5 2000/03/10 08:32:39 sverrehu Exp $ */ +/* $Id$ */ #ifndef SHHOPT_H #define SHHOPT_H @@ -30,8 +30,8 @@ } optStruct; -void optSetFatalFunc(void (*f)(const char *, ...)); -void optParseOptions(int *argc, char *argv[], +extern void optSetFatalFunc(void (*f)(const char *, ...)); +extern void optParseOptions(int *argc, char *argv[], optStruct opt[], int allowNegNum); #ifdef __cplusplus

2 1

Remove som warnings in dump-svg.c
by Anders Broman 14 Apr '08

14 Apr '08

Index: dump-svg.c =================================================================== --- dump-svg.c (revision 8039) +++ dump-svg.c (working copy) @@ -250,7 +250,6 @@ static void printSVGClose(float xMin, float yMin, float xMax, float yMax) { float scale; - int i; scale = max((xMax-xMin)/CANVASWIDTH,(yMax-yMin)/CANVASHEIGHT); /* enclose whole canvas in its bounding box */ @@ -752,12 +751,12 @@ static void calculateIntersectionPoints(GraphEdge *tEdge) { float alpha, beta; - const float PI = acos(-1); + const float PI = (float)acos(-1); /* calculate intersection of edge and startNode */ - alpha = atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, + alpha = (float)atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, tEdge->startNode->dia.x-tEdge->endNode->dia.x); - beta = atan2(tEdge->startNode->dia.h, tEdge->startNode->dia.w); + beta = (float)atan2(tEdge->startNode->dia.h, tEdge->startNode->dia.w); if (alpha < 0) alpha += PI; if (alpha < beta @@ -772,11 +771,11 @@ tEdge->startNode->dia.w/2; } if (tEdge->startNode->dia.y < tEdge->endNode->dia.y) { - tEdge->dia.startY = tEdge->startNode->dia.y + - fabsf(tEdge->startNode->dia.w*tan(alpha)/2); + tEdge->dia.startY = (float)(tEdge->startNode->dia.y + + fabsf(tEdge->startNode->dia.w*tan(alpha)/2)); } else { - tEdge->dia.startY = tEdge->startNode->dia.y - - fabsf(tEdge->startNode->dia.w*tan(alpha)/2); + tEdge->dia.startY = (float)(tEdge->startNode->dia.y - + fabsf(tEdge->startNode->dia.w*tan(alpha)/2)); } } else { /* intersection at top or bottom border */ @@ -788,18 +787,18 @@ tEdge->startNode->dia.h/2; } if (tEdge->startNode->dia.x < tEdge->endNode->dia.x) { - tEdge->dia.startX = tEdge->startNode->dia.x + - fabsf(tEdge->startNode->dia.h/(2*tan(alpha))); + tEdge->dia.startX = (float)(tEdge->startNode->dia.x + + fabsf(tEdge->startNode->dia.h/(2*tan(alpha)))); } else { - tEdge->dia.startX = tEdge->startNode->dia.x - - fabsf(tEdge->startNode->dia.h/(2*tan(alpha))); + tEdge->dia.startX = (float)(tEdge->startNode->dia.x - + fabsf(tEdge->startNode->dia.h/(2*tan(alpha)))); } } /* calculate intersection of edge and endNode */ - alpha = atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, + alpha = (float)atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, tEdge->startNode->dia.x-tEdge->endNode->dia.x); - beta = atan2(tEdge->endNode->dia.h, tEdge->endNode->dia.w); + beta = (float)atan2(tEdge->endNode->dia.h, tEdge->endNode->dia.w); if (alpha < 0) alpha += PI; if (alpha < beta @@ -812,11 +811,11 @@ tEdge->dia.endX = tEdge->endNode->dia.x - tEdge->endNode->dia.w/2; } if (tEdge->startNode->dia.y > tEdge->endNode->dia.y) { - tEdge->dia.endY = tEdge->endNode->dia.y + - fabsf(tEdge->endNode->dia.w*tan(alpha)/2); + tEdge->dia.endY = (float)(tEdge->endNode->dia.y + + fabsf(tEdge->endNode->dia.w*tan(alpha)/2)); } else { - tEdge->dia.endY = tEdge->endNode->dia.y - - fabsf(tEdge->endNode->dia.w*tan(alpha)/2); + tEdge->dia.endY = (float)(tEdge->endNode->dia.y - + fabsf(tEdge->endNode->dia.w*tan(alpha)/2)); } } else { /* intersection at top or bottom border */ @@ -826,11 +825,11 @@ tEdge->dia.endY = tEdge->endNode->dia.y - tEdge->endNode->dia.h/2; } if (tEdge->startNode->dia.x > tEdge->endNode->dia.x) { - tEdge->dia.endX = tEdge->endNode->dia.x + - fabsf(tEdge->endNode->dia.h/(2*tan(alpha))); + tEdge->dia.endX = (float)(tEdge->endNode->dia.x + + fabsf(tEdge->endNode->dia.h/(2*tan(alpha)))); } else { - tEdge->dia.endX = tEdge->endNode->dia.x - - fabsf(tEdge->endNode->dia.h/(2*tan(alpha))); + tEdge->dia.endX = (float)(tEdge->endNode->dia.x - + fabsf(tEdge->endNode->dia.h/(2*tan(alpha)))); } } } @@ -1676,7 +1675,7 @@ int j, k; char *tooltip; SmiElement *smiElement; - StringListElem *tElem, *lastElem; + StringListElem *tElem; printf(" <g id=\"MI%i\" transform=\"translate", *miNr); printf("(%.2f,%.2f)\">\n", *x, *y); @@ -1824,7 +1823,7 @@ /* SmiRevision *smiRevision; */ SmiOption *smiOption; SmiRefinement *smiRefinement; - StringListElem *tElem, *lastElem; + StringListElem *tElem; printf(" <g id=\"MI%i\" transform=\"translate", *miNr); printf("(%.2f,%.2f)\">\n", *x, *y); @@ -2699,7 +2698,7 @@ i--; /* test if we must shrink moduleInformation to fit it into canvas */ - miHeight = ((miCount + i - (2 * j)) * 15 + 10); + miHeight = (float)(((miCount + i - (2 * j)) * 15 + 10)); if (miHeight > maxHeight) scale *= maxHeight/miHeight; @@ -2856,11 +2855,11 @@ if ((dist = intersect(vNode, eEdge))) { if (eEdge->startNode->dia.x == eEdge->endNode->dia.x) { eEdge->startNode->dia.xDisp -= - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); eEdge->endNode->dia.xDisp -= - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); vNode->dia.xDisp += - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); } else { xDelta = -1*(eEdge->endNode->dia.y -eEdge->startNode->dia.y) @@ -2903,7 +2902,7 @@ vNode->dia.y += (vNode->dia.yDisp/absDisp)*min(absDisp, t); } /* reduce the temperature as the layout approaches a better configuration */ - t *= 0.9; + t *= (float)0.9; } } @@ -2978,7 +2977,7 @@ tComponent->xOffset = *x - tComponent->xMin; *x += 10 + tComponent->xMax - tComponent->xMin; - tComponent->yOffset = -0.5*(tComponent->yMin+tComponent->yMax); + tComponent->yOffset = (float)(-0.5*(tComponent->yMin+tComponent->yMax)); if (tComponent->yMin + tComponent->yOffset < *yMin) *yMin = tComponent->yMin + tComponent->yOffset; if (tComponent->yMax + tComponent->yOffset > *yMax) @@ -3138,10 +3137,8 @@ */ static void generateSVG(int modc, SmiModule **modv) { - GraphNode *tNode, *lastNode = NULL; - GraphEdge *tEdge; - GraphComponent *tComponent; - int group, nodecount=0, singleNodes=1, miCount=0; + GraphNode *lastNode = NULL; + int nodecount=0, singleNodes=1, miCount=0; int i, idCount=0, TCcount=0, miPrint=0; float x=10, xMin=0, yMin=0, xMax=0, yMax=0, maxHeight=0;

1 0