From 402f527cbbcda1d45b738e89cca9296ef5901921 Mon Sep 17 00:00:00 2001 From: inoussa Date: Fri, 25 Apr 2014 19:05:55 +0000 Subject: [PATCH] Remove not used variables, fix uninitialized variables. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2970 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/ws_helper/ws_parser_imp.pas | 14 +++++++++----- wst/trunk/ws_helper/xsd_generator.pas | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wst/trunk/ws_helper/ws_parser_imp.pas b/wst/trunk/ws_helper/ws_parser_imp.pas index 6907fc3ab..01f3324db 100644 --- a/wst/trunk/ws_helper/ws_parser_imp.pas +++ b/wst/trunk/ws_helper/ws_parser_imp.pas @@ -853,7 +853,7 @@ var var AMaxUnboundded : Boolean ); var - locAttCursor, locPartCursor : IObjectCursor; + locPartCursor : IObjectCursor; locMin, locMax : Integer; locMaxOccurUnbounded : Boolean; locStrBuffer : string; @@ -914,6 +914,7 @@ var locType := nil; locTypeName := ''; locTypeHint := ''; + locInternalEltName := ''; locAttCursor := CreateAttributesCursor(AElement,cetRttiNode); locPartCursor := CreateCursorOn(locAttCursor.Clone() as IObjectCursor,ParseFilter(Format('%s = %s',[s_NODE_NAME,QuotedStr(s_name)]),TDOMNodeRttiExposer)); locPartCursor.Reset(); @@ -928,9 +929,9 @@ var locIsRefElement := True; end; locName := (locPartCursor.GetCurrent() as TDOMNodeRttiExposer).NodeValue; - if locIsRefElement then begin + if locIsRefElement then locName := ExtractNameFromQName(locName); - end; + locInternalEltName := ExtractIdentifier(locName); if IsStrEmpty(locName) then raise EXsdParserException.Create(SERR_InvalidElementDef_EmptyName); if locIsRefElement then begin @@ -1113,12 +1114,14 @@ var end; var - locNode, locAnyNode, locAnyAttNode : TDOMNode; + locNode : TDOMNode; locNS, locLN : string; locEltCrs, locEltAttCrs : IObjectCursor; locBoundInfos : TOccurrenceRec; begin + FillChar(locBoundInfos,SizeOf(locBoundInfos),#0); if Assigned(AEltCrs) then begin + locEltAttCrs := nil; AEltCrs.Reset(); while AEltCrs.MoveNext() do begin locNode := (AEltCrs.GetCurrent() as TDOMNodeRttiExposer).InnerObject; @@ -1439,6 +1442,7 @@ var locName := ExtractNameFromQName(locName); if IsStrEmpty(locName) then raise EXsdInvalidDefinitionException.Create(SERR_InvalidAttributeDef_EmptyName); + locInternalEltName := ExtractIdentifier(locName); if locIsRefElement then begin locTypeName := locName; @@ -1486,7 +1490,7 @@ var locStoreOptIdx := 1{optional by default!}; //0; end; - locInternalEltName := locName; + locInternalEltName := ExtractIdentifier(locName); locHasInternalName := IsReservedKeyWord(locInternalEltName); if locHasInternalName then locInternalEltName := Format('_%s',[locInternalEltName]); diff --git a/wst/trunk/ws_helper/xsd_generator.pas b/wst/trunk/ws_helper/xsd_generator.pas index c57976c32..5263f1fce 100644 --- a/wst/trunk/ws_helper/xsd_generator.pas +++ b/wst/trunk/ws_helper/xsd_generator.pas @@ -398,10 +398,9 @@ function FindAttributeByValueInNode( const AStartingWith : string = '' ):boolean;overload; var - i,c : Integer; - b : Boolean; k : Integer; begin + k := 0; Result := FindAttributeByValueInNode( AAttValue,ANode,AResAtt,AStartIndex,AStartingWith,k );