diff --git a/wst/trunk/base_binary_formatter.pas b/wst/trunk/base_binary_formatter.pas index eccd34f9d..dd933518c 100644 --- a/wst/trunk/base_binary_formatter.pas +++ b/wst/trunk/base_binary_formatter.pas @@ -634,7 +634,6 @@ begin AddObj(AOwner,Result); Except Freemem(Result,resLen); - Result := nil; Raise; End; end; @@ -668,7 +667,6 @@ begin AddObj(AOwner,Result); Except Freemem(Result,resLen); - Result := nil; Raise; End; end; diff --git a/wst/trunk/basex_encode.pas b/wst/trunk/basex_encode.pas index 155de5813..b75854b43 100644 --- a/wst/trunk/basex_encode.pas +++ b/wst/trunk/basex_encode.pas @@ -337,6 +337,7 @@ begin locInIndex := 0; locAtualLen := 0; locPadded := 0; + locInValue := 0; locInLen := Length(AInBuffer); SetLength(Result,locInLen); locBuffer := @(AInBuffer[1]); diff --git a/wst/trunk/indy_tcp_protocol.pas b/wst/trunk/indy_tcp_protocol.pas index acd877faf..8fadd7cb1 100644 --- a/wst/trunk/indy_tcp_protocol.pas +++ b/wst/trunk/indy_tcp_protocol.pas @@ -141,7 +141,6 @@ begin Connect(); FConnection.IOHandler.Write(buffStream,buffStream.Size,False); - bufferLen := 0; bufferLen := FConnection.IOHandler.ReadLongInt(False); bufferLen := Reverse_32(bufferLen); if not HasFilter() then begin diff --git a/wst/trunk/metadata_repository.pas b/wst/trunk/metadata_repository.pas index e04d639de..91d26e45e 100644 --- a/wst/trunk/metadata_repository.pas +++ b/wst/trunk/metadata_repository.pas @@ -796,7 +796,6 @@ var i : Integer; rp : PServiceRepository; begin - Result := nil; i := FindInnerListIndex(ARepName); if ( i < 0 ) then i := InternalLoadRepository(ARepName); diff --git a/wst/trunk/ws_helper/xsd_parser.pas b/wst/trunk/ws_helper/xsd_parser.pas index 2e105eb7a..c529e87b5 100644 --- a/wst/trunk/ws_helper/xsd_parser.pas +++ b/wst/trunk/ws_helper/xsd_parser.pas @@ -675,7 +675,7 @@ end; procedure TCustomXsdSchemaParser.CreateImportParsers(); var - crsSchemaChild, typTmpCrs : IObjectCursor; + crsSchemaChild : IObjectCursor; strFilter, locFileName, locNameSpace : string; importNode : TDOMElement; importDoc : TXMLDocument; diff --git a/wst/trunk/wst_resources_imp.pas b/wst/trunk/wst_resources_imp.pas index 9c4ac5dd9..deffcec68 100644 --- a/wst/trunk/wst_resources_imp.pas +++ b/wst/trunk/wst_resources_imp.pas @@ -219,7 +219,6 @@ Var Function GetWSTResourceManager(Force : Boolean = True) : TWSTResourceManager; begin - Result:=ResMGR; If (ResMgr=Nil) and Force then ResMGr:=TCollectionResourceManager.Create; Result:=ResMGR; diff --git a/wst/trunk/wst_rtti_filter/rtti_filters.pas b/wst/trunk/wst_rtti_filter/rtti_filters.pas index 5ded89dd4..0242fba3b 100644 --- a/wst/trunk/wst_rtti_filter/rtti_filters.pas +++ b/wst/trunk/wst_rtti_filter/rtti_filters.pas @@ -565,8 +565,10 @@ begin nfoNotEqual : Result := ( GetOrdProp(AInstance,PropInfo) <> ComparedValue ); nfoGreaterOrEqual : Result := ( GetOrdProp(AInstance,PropInfo) >= ComparedValue ); nfoLesserOrEqual : Result := ( GetOrdProp(AInstance,PropInfo) <= ComparedValue ); - else + else begin Assert(False); + Result := False; + end; end; end; @@ -802,8 +804,10 @@ begin sfoEqualCaseSensitive : Result := ( GetStrProp(AInstance,PropInfo) = ComparedValue ); sfoEqualCaseInsensitive : Result := AnsiSameText(GetStrProp(AInstance,PropInfo),ComparedValue); sfoNotEqual : Result := ( GetStrProp(AInstance,PropInfo) <> ComparedValue); - else + else begin Assert(False); + Result := False; + end; end; end; @@ -828,8 +832,10 @@ begin sfoEqualCaseSensitive : Result := ( GetWideStrProp(AInstance,PropInfo) = ComparedValue ); sfoEqualCaseInsensitive : Result := ( LowerCase(GetWideStrProp(AInstance,PropInfo)) = LowerCase(ComparedValue) ); sfoNotEqual : Result := not SameText(GetWideStrProp(AInstance,PropInfo),ComparedValue); - else + else begin Assert(False); + Result := False; + end; end; end;