diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2015-01-17 00:37:31 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-19 06:18:37 +0000 |
| commit | 5901827bd44dc3600bf66c83882e6847439d59d6 (patch) | |
| tree | 3e4477e7a25cb10d836f6dcba1c49fcbb9e637d4 /ucb/source | |
| parent | a1fb4ac1991a8da2e527b64a0a01a88a8f2959e3 (diff) | |
fdo#39440 reduce scope of local variables
This addresses some cppcheck warnings.
Change-Id: I1cd8b118e2598b8b18fb445851a3bb41e554267b
Reviewed-on: https://gerrit.libreoffice.org/13967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/sorter/sortresult.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/test_ftpurl.cxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 7e1dde0ab407..d5fcabf5069e 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -1278,12 +1278,11 @@ sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry, sal_IntPtr nEnd = _nEnd; sal_IntPtr nMid = 0, nCompare = 0; - SortListData *pMid; while ( nStart <= nEnd ) { nMid = ( nEnd - nStart ) / 2 + nStart; - pMid = maS2O.GetData( nMid ); + SortListData *pMid = maS2O.GetData( nMid ); nCompare = Compare( pEntry, pMid ); if ( !nCompare ) @@ -1771,12 +1770,11 @@ void SortedResultSet::ResortModified( EventList* pList ) void SortedResultSet::ResortNew( EventList* pList ) { sal_IntPtr i, j, nNewPos, nVal; - SortListData *pData; try { for ( i = mnLastSort; i<(sal_IntPtr)maS2O.Count(); i++ ) { - pData = (SortListData*) maModList.GetObject( i ); + SortListData *pData = (SortListData*) maModList.GetObject( i ); nNewPos = FindPos( pData, 1, mnLastSort ); if ( nNewPos != i ) { diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index bbc99cae9849..b93d2b09afca 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -245,7 +245,7 @@ int test_ftpopen(void) FILE* file = url.open(); if(file) { - int nbuf,ndest; + int nbuf; const int bffsz = 256; char buff[bffsz]; char *dest = (char*) malloc(sizeof(char)); @@ -254,7 +254,7 @@ int test_ftpopen(void) memset((void*)buff, 0, bffsz); fread(buff,bffsz-1,1,file); nbuf = strlen(buff); - ndest = strlen(dest); + int ndest = strlen(dest); dest = (char*)realloc(dest,ndest + nbuf + 1); strncat(dest,buff,nbuf); } while(nbuf == bffsz-1); |