Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 03/04: [TELNET] Add missing curly braces to while-statement

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454745e48ca3b583e9d6e… commit 454745e48ca3b583e9d6e1e70a9be418f490a88d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 17:20:02 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:54:08 2019 +0200 [TELNET] Add missing curly braces to while-statement Fixes GCC 8 warning: base/applications/network/telnet/src/tmapldr.cpp:70:3: error: this 'while' clause does not guard... [-Werror=misleading-indentation] while (buf[len]) ^~~~~ base/applications/network/telnet/src/tmapldr.cpp:74:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'while' if (len && (buf[len-1] == ' ')) { ^~ --- base/applications/network/telnet/src/tmapldr.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/base/applications/network/telnet/src/tmapldr.cpp b/base/applications/network/telnet/src/tmapldr.cpp index 99b3b62062..ef1ada0dc6 100644 --- a/base/applications/network/telnet/src/tmapldr.cpp +++ b/base/applications/network/telnet/src/tmapldr.cpp @@ -67,18 +67,20 @@ static char * getline(istream& i, char* buf, int size){ if ((buf[0]==0)||(buf[0]==';')) continue; len = 0; // look for comment like this one - while (buf[len]) - if ((buf[len] == '/') && (buf[len+1] == '/')) buf[len] = 0; - else len++; + while (buf[len]) + { + if ((buf[len] == '/') && (buf[len + 1] == '/')) buf[len] = 0; + else len++; - if (len && (buf[len-1] == ' ')) { + if (len && (buf[len - 1] == ' ')) { len--; - buf[len]=0; - }; - // in case for comment like this one (in line just a comment) - if (buf[0]==0) continue; + buf[len] = 0; + }; + } + // in case for comment like this one (in line just a comment) + if (buf[0] == 0) continue; - break; + break; }; return (buf); };

5 years, 7 months

[reactos] 02/04: [TELNET] Add missing curly braces to if-statelent

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdf221cb175fc12c6784b… commit fdf221cb175fc12c6784bd4e9fbda64d69dbb11b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 17:05:33 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:54:08 2019 +0200 [TELNET] Add missing curly braces to if-statelent Fixes GCC 8 warning: base/applications/network/telnet/src/tnmain.cpp:171:8: error: this 'for' clause does not guard... [-Werror=misleading-indentation] for (j = cursor; j >= 0; j--) ^~~ base/applications/network/telnet/src/tnmain.cpp:174:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'for' for (k = --j; k >= 0; k--) ^~~ --- base/applications/network/telnet/src/tnmain.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/base/applications/network/telnet/src/tnmain.cpp b/base/applications/network/telnet/src/tnmain.cpp index d930dc1189..25bf556914 100644 --- a/base/applications/network/telnet/src/tnmain.cpp +++ b/base/applications/network/telnet/src/tnmain.cpp @@ -146,14 +146,18 @@ struct cmdHistory * cfgets (char *buf, unsigned int length, struct cmdHistory *c if (InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { unsigned int j, k; - for (j = cursor; j <= current; j++) - if (buf[j+1] == ' ' || (j+1)==current) - break; - for (k = ++j; k <= current; k++) - if (buf[k] != ' ' || k == current) { - cursor = k == current ? --k : k; - break; - } + for (j = cursor; j <= current; j++) + { + if (buf[j + 1] == ' ' || (j + 1) == current) + break; + for (k = ++j; k <= current; k++) + { + if (buf[k] != ' ' || k == current) { + cursor = k == current ? --k : k; + break; + } + } + } } else cursor++; MustRefresh = 1;

5 years, 7 months

[reactos] 01/04: [TELNET] disable restrict warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d7a38c41327fdd40f26… commit 85d7a38c41327fdd40f26145aa6db5a3cd320c5d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 16:22:34 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:54:07 2019 +0200 [TELNET] disable restrict warnings Fixes GCC 8 warning: base/applications/network/telnet/src/tnmain.cpp:190:13: error: 'char* strcpy(char*, const char*)' accessing 1 byte at offsets [0, 2147483647] and [0, 2147483647] may overlap 1 byte at offset 0 [-Werror=restrict] strcpy(&buf[cursor],&buf[cursor+1]); ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- base/applications/network/telnet/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index dedb110f71..b0916c0a24 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -3,6 +3,10 @@ set_cpp(WITH_EXCEPTIONS WITH_STL) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +if(NOT MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + add_compile_flags("-Wno-restrict") +endif() + list(APPEND SOURCE src/ansiprsr.cpp src/keytrans.cpp

5 years, 7 months

[reactos] 01/01: [LDR] Silence some debug logs when images overlap

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74be88ac473425fc99e9a… commit 74be88ac473425fc99e9a363ba8cd604702262bf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 27 12:17:16 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:24:28 2019 +0200 [LDR] Silence some debug logs when images overlap --- dll/ntdll/ldr/ldrutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 75fc45fd92..1011a85046 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1332,7 +1332,7 @@ SkipCheck: ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase; ImageEnd = ImageBase + ViewSize; - DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); + DPRINT("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); /* Scan all the modules */ ListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -1371,7 +1371,7 @@ SkipCheck: RtlInitUnicodeString(&OverlapDll, L"Dynamically Allocated Memory"); } - DPRINT1("Overlapping DLL: %wZ\n", &OverlapDll); + DPRINT("Overlapping DLL: %wZ\n", &OverlapDll); /* Are we dealing with a DLL? */ if (LdrEntry->Flags & LDRP_IMAGE_DLL)

5 years, 7 months

[reactos] 13/13: [BROWSEUI] Fix indentation

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=801ec51a91c3af778d88d… commit 801ec51a91c3af778d88d8f9446eee0cb1d8e943 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 20:30:18 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [BROWSEUI] Fix indentation Fixes GCC 8 warning: dll/win32/browseui/explorerband.cpp:1332:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (!SUCCEEDED(hr) || !pParent.p) ^~ dll/win32/browseui/explorerband.cpp:1335:21: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' hr = pParent->SetNameOf(0, pidlChild, dispInfo->item.pszText, SHGDN_INFOLDER, &pidlNew); ^~ --- dll/win32/browseui/explorerband.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 968b173ec3..741960c1d1 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -1329,8 +1329,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM LPCITEMIDLIST pidlChild; hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pidlChild); - if (!SUCCEEDED(hr) || !pParent.p) - return E_FAIL; + if (!SUCCEEDED(hr) || !pParent.p) + return E_FAIL; hr = pParent->SetNameOf(0, pidlChild, dispInfo->item.pszText, SHGDN_INFOLDER, &pidlNew); if(SUCCEEDED(hr) && pidlNew)

5 years, 7 months

[reactos] 12/13: [GLU32] Fix indentation

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95269bc8d17d7223bf2a7… commit 95269bc8d17d7223bf2a7be0b1c6927c466d1476 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 20:56:40 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [GLU32] Fix indentation Fixes GCC 8 warnings: dll/opengl/glu32/src/libnurbs/internals/subdivider.cc:852:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; ^~ dll/opengl/glu32/src/libnurbs/internals/subdivider.cc:852:59: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; ^~~~ --- dll/opengl/glu32/src/libnurbs/internals/quilt.cc | 3 ++- dll/opengl/glu32/src/libnurbs/internals/subdivider.cc | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/opengl/glu32/src/libnurbs/internals/quilt.cc b/dll/opengl/glu32/src/libnurbs/internals/quilt.cc index d51188a2de..b99f92f49d 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/quilt.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/quilt.cc @@ -62,7 +62,8 @@ Quilt::deleteMe( Pool& p ) { for( Quiltspec *q=qspec; q != eqspec; q++ ) { #if 1 - if( q->breakpoints) delete[] q->breakpoints; q->breakpoints = 0; + if( q->breakpoints) delete[] q->breakpoints; + q->breakpoints = 0; #else if( q->breakpoints) { delete[] q->breakpoints; diff --git a/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc b/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc index d003d1ebc4..e12d063b12 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc @@ -849,8 +849,10 @@ Subdivider::freejarcs( Bin& bin ) Arc_ptr jarc; while( (jarc = bin.removearc()) != NULL ) { - if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; - if( jarc->bezierArc) jarc->bezierArc->deleteMe( bezierarcpool ); jarc->bezierArc = 0; + if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); + jarc->pwlArc = 0; + if( jarc->bezierArc) jarc->bezierArc->deleteMe( bezierarcpool ); + jarc->bezierArc = 0; jarc->deleteMe( arcpool ); } }

5 years, 7 months

[reactos] 11/13: [MSHTML] Convert tabs to spaces

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=207a0f520e6199c5f6aaf… commit 207a0f520e6199c5f6aaf987112c07f10ccbc0cf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 20:27:21 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [MSHTML] Convert tabs to spaces Fixes GCC 8 warning: dll/win32/mshtml/script.c:844:4: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if(!new_buf) ^~ dll/win32/mshtml/script.c:846:13: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' This->size <<= 1; ^~~~ --- dll/win32/mshtml/script.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/mshtml/script.c b/dll/win32/mshtml/script.c index 39d8aedbb4..b6d309ed58 100644 --- a/dll/win32/mshtml/script.c +++ b/dll/win32/mshtml/script.c @@ -839,10 +839,10 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) do { if(This->bsc.readed >= This->size) { - void *new_buf; - new_buf = heap_realloc(This->buf, This->size << 1); - if(!new_buf) - return E_OUTOFMEMORY; + void *new_buf; + new_buf = heap_realloc(This->buf, This->size << 1); + if(!new_buf) + return E_OUTOFMEMORY; This->size <<= 1; This->buf = new_buf; }

5 years, 7 months

[reactos] 10/13: [REISERFS] Convert a tab to spaces

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2944d29969b273f02670d… commit 2944d29969b273f02670de86a74037175dc54db3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 18:18:23 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [REISERFS] Convert a tab to spaces Fixes GCC 8 warning: drivers/filesystems/reiserfs/src/memory.c:874:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (Mcb->RfsdFcb) ^~ drivers/filesystems/reiserfs/src/memory.c:877:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' if (RfsdLoadInode(Vcb, &(Mcb->Key), &RfsdIno)) { ^~ --- drivers/filesystems/reiserfs/src/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/reiserfs/src/memory.c b/drivers/filesystems/reiserfs/src/memory.c index 6742b04bcd..6285f4632c 100644 --- a/drivers/filesystems/reiserfs/src/memory.c +++ b/drivers/filesystems/reiserfs/src/memory.c @@ -874,7 +874,7 @@ RfsdCreateFcbFromMcb(PRFSD_VCB Vcb, PRFSD_MCB Mcb) if (Mcb->RfsdFcb) return Mcb->RfsdFcb; - if (RfsdLoadInode(Vcb, &(Mcb->Key), &RfsdIno)) { + if (RfsdLoadInode(Vcb, &(Mcb->Key), &RfsdIno)) { PRFSD_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, sizeof(RFSD_INODE), RFSD_POOL_TAG); if (!pTmpInode) { goto errorout;

5 years, 7 months

[reactos] 09/13: [TFTPD] Disable format-overflow warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9dc6c14eca4ec17c98d96… commit 9dc6c14eca4ec17c98d962dd7d9e15aa68098965 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 19:29:45 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [TFTPD] Disable format-overflow warnings --- base/services/tftpd/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 0ae2efab3d..0159e0e1a3 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -1,4 +1,8 @@ +if(NOT MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + add_compile_flags("-Wno-format-overflow") +endif() + add_executable(tftpd tftpd.cpp) set_module_type(tftpd win32cui) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32)

5 years, 7 months

[reactos] 08/13: [MINIZIP] Add curly braces to if-statement and fix indentation

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ac9e484657f12b548f84… commit 1ac9e484657f12b548f8424b938ad6a5275ffc29 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 28 18:46:40 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon May 27 13:22:40 2019 +0200 [MINIZIP] Add curly braces to if-statement and fix indentation Fixes GCC 8 warning: sdk/lib/3rdparty/zlib/contrib/minizip/zip.c:521:5: error: this 'for' clause does not guard... [-Werror=misleading-indentation] for (i=(int)uReadSize-3; (i--)>0;) ^~~ sdk/lib/3rdparty/zlib/contrib/minizip/zip.c:529:7: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'for' if (uPosFound!=0) ^~ --- sdk/lib/3rdparty/zlib/contrib/minizip/zip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/zlib/contrib/minizip/zip.c b/sdk/lib/3rdparty/zlib/contrib/minizip/zip.c index d5ab730933..198c1a8940 100644 --- a/sdk/lib/3rdparty/zlib/contrib/minizip/zip.c +++ b/sdk/lib/3rdparty/zlib/contrib/minizip/zip.c @@ -519,15 +519,17 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f break; for (i=(int)uReadSize-3; (i--)>0;) + { if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) { uPosFound = uReadPos+i; break; } + } - if (uPosFound!=0) - break; + if (uPosFound!=0) + break; } TRYFREE(buf); return uPosFound;

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2019