[haiku-commits] haiku: hrev50402 - in src: tools/fs_shell servers/app/decorator add-ons/print/drivers/preview kits/tracker add-ons/print/drivers/pcl6

  • From: pulkomandy@xxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 10 Jul 2016 17:14:30 +0200 (CEST)

hrev50402 adds 8 changesets to branch 'master'
old head: eff2d235ba89a5274ddf81178a50d6650f08e20d
new head: 1c6c51315e6a17787ce9833c6b5f34b6049ce065
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1c6c51315e6a+%5Eeff2d235ba89

----------------------------------------------------------------------------

07d59ab7dbc6: PictureIterator.h: fix header guard spelling
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Fixes: #12839

e019775491cc: TrackerString.cpp: fix comparison between pointer and integer
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12842

dbb1fa50c64d: DecorManager.cpp: fix comparison between pointer and integer
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12843

51bfb0569392: pcl6: Fix mismatching allocation and deallocation
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12835

46b40482a68d: block_cache.cpp: fix gcc warnings
  
  Since 'maxAccessed' and 'count' is int32,
  use INT32_MAX instead of LONG_MAX.
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12833

12e39ec56072: JobSetupWindow.cpp: fix clang warning
  
  Since 'lastPage' is int32, use INT32_MAX instead of LONG_MAX.
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12832

163f9ddfef1b: PictureIterator.h: fix header guard spelling
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12830

1c6c51315e6a: PackageActionHandler.h: fix header guard spelling
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  Ticket: #12828

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

----------------------------------------------------------------------------

9 files changed, 10 insertions(+), 10 deletions(-)
headers/private/print/PictureIterator.h                | 2 +-
src/add-ons/print/drivers/pcl6/DeltaRowCompression.cpp | 2 +-
src/add-ons/print/drivers/pcl6/PCL6Writer.cpp          | 2 +-
src/add-ons/print/drivers/pdf/source/PictureIterator.h | 2 +-
src/add-ons/print/drivers/preview/JobSetupWindow.cpp   | 2 +-
src/apps/haikudepot/model/PackageActionHandler.h       | 2 +-
src/kits/tracker/TrackerString.cpp                     | 2 +-
src/servers/app/decorator/DecorManager.cpp             | 2 +-
src/tools/fs_shell/block_cache.cpp                     | 4 ++--

############################################################################

Commit:      07d59ab7dbc6e8552d0843daf1cef033da7d4ace
URL:         http://cgit.haiku-os.org/haiku/commit/?id=07d59ab7dbc6
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Fri Jul  1 21:11:09 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:20 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12839

PictureIterator.h: fix header guard spelling

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Fixes: #12839

----------------------------------------------------------------------------

diff --git a/headers/private/print/PictureIterator.h 
b/headers/private/print/PictureIterator.h
index 09d883b..15ce852 100644
--- a/headers/private/print/PictureIterator.h
+++ b/headers/private/print/PictureIterator.h
@@ -30,7 +30,7 @@ THE SOFTWARE.
 */
 
 #ifndef _PICTURE_ITERATOR_H
-#define _PICTURE_TIERATOR_H
+#define _PICTURE_ITERATOR_H
 
 #include <AppKit.h>
 #include <InterfaceKit.h>

############################################################################

Commit:      e019775491cc7be55c4f2269fe8792b0d204cf09
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e019775491cc
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sat Jul  2 09:04:01 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:23 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12842

TrackerString.cpp: fix comparison between pointer and integer

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12842

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/TrackerString.cpp 
b/src/kits/tracker/TrackerString.cpp
index b559139..be4bbef 100644
--- a/src/kits/tracker/TrackerString.cpp
+++ b/src/kits/tracker/TrackerString.cpp
@@ -265,7 +265,7 @@ TrackerString::StringMatchesPattern(const char* string, 
const char* pattern,
                                // Collapse any ** and *? constructions:
                                while (*pattern == '*' || *pattern == '?') {
                                        pattern++;
-                                       if (*pattern == '?' && string != '\0') {
+                                       if (*pattern == '?' && *string != '\0') 
{
                                                string++;
                                                if (IsInsideGlyph(string[0]))
                                                        string = 
MoveToEndOfGlyph(string);

############################################################################

Commit:      dbb1fa50c64dc700514e7efd0850a7b215b495d7
URL:         http://cgit.haiku-os.org/haiku/commit/?id=dbb1fa50c64d
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sat Jul  2 09:04:32 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:26 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12843

DecorManager.cpp: fix comparison between pointer and integer

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12843

----------------------------------------------------------------------------

diff --git a/src/servers/app/decorator/DecorManager.cpp 
b/src/servers/app/decorator/DecorManager.cpp
index b09830e..ef01bd6 100644
--- a/src/servers/app/decorator/DecorManager.cpp
+++ b/src/servers/app/decorator/DecorManager.cpp
@@ -70,7 +70,7 @@ DecorAddOn::AllocateDecorator(Desktop* desktop, 
DrawingEngine* engine,
 
        decorator->UpdateColors(settings);
 
-       if (decorator->AddTab(settings, title, look, flags) == false) {
+       if (decorator->AddTab(settings, title, look, flags) == NULL) {
                delete decorator;
                return NULL;
        }

############################################################################

Commit:      51bfb056939262419f13d55f527e5106c48555b4
URL:         http://cgit.haiku-os.org/haiku/commit/?id=51bfb0569392
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Jun 26 20:33:35 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:29 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12835

pcl6: Fix mismatching allocation and deallocation

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12835

----------------------------------------------------------------------------

diff --git a/src/add-ons/print/drivers/pcl6/DeltaRowCompression.cpp 
b/src/add-ons/print/drivers/pcl6/DeltaRowCompression.cpp
index f33fe18..84a38d5 100644
--- a/src/add-ons/print/drivers/pcl6/DeltaRowCompression.cpp
+++ b/src/add-ons/print/drivers/pcl6/DeltaRowCompression.cpp
@@ -26,7 +26,7 @@ AbstractDeltaRowCompressor::AbstractDeltaRowCompressor(int 
rowSize,
 
 AbstractDeltaRowCompressor::~AbstractDeltaRowCompressor()
 {
-       delete fSeedRow;
+       delete[] fSeedRow;
        fSeedRow = NULL;
 }
 
diff --git a/src/add-ons/print/drivers/pcl6/PCL6Writer.cpp 
b/src/add-ons/print/drivers/pcl6/PCL6Writer.cpp
index 9df5f0d..2a02a02 100644
--- a/src/add-ons/print/drivers/pcl6/PCL6Writer.cpp
+++ b/src/add-ons/print/drivers/pcl6/PCL6Writer.cpp
@@ -26,7 +26,7 @@ PCL6Writer::PCL6Writer(PCL6WriterStream* stream, uint32 
bufferSize)
 
 PCL6Writer::~PCL6Writer()
 {
-       delete fBuffer;
+       delete[] fBuffer;
        fBuffer = NULL;
 }
 

############################################################################

Commit:      46b40482a68d1a389c3c43ca01de3f092ef0e87b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=46b40482a68d
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Jun 26 08:24:27 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:33 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12833

block_cache.cpp: fix gcc warnings

Since 'maxAccessed' and 'count' is int32,
use INT32_MAX instead of LONG_MAX.

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12833

----------------------------------------------------------------------------

diff --git a/src/tools/fs_shell/block_cache.cpp 
b/src/tools/fs_shell/block_cache.cpp
index 72a6268..461e0bc 100644
--- a/src/tools/fs_shell/block_cache.cpp
+++ b/src/tools/fs_shell/block_cache.cpp
@@ -124,8 +124,8 @@ struct block_cache {
 
        void                    Free(void* buffer);
        void*                   Allocate();
-       void                    RemoveUnusedBlocks(int32_t maxAccessed = 
LONG_MAX,
-                                               int32_t count = LONG_MAX);
+       void                    RemoveUnusedBlocks(int32_t maxAccessed = 
INT32_MAX,
+                                               int32_t count = INT32_MAX);
        void                    RemoveBlock(cached_block* block);
        void                    DiscardBlock(cached_block* block);
        void                    FreeBlock(cached_block* block);

############################################################################

Commit:      12e39ec56072ebaf1772ba4a13a1e7c730ddcfa3
URL:         http://cgit.haiku-os.org/haiku/commit/?id=12e39ec56072
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Jun 26 07:36:52 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:36 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12832

JobSetupWindow.cpp: fix clang warning

Since 'lastPage' is int32, use INT32_MAX instead of LONG_MAX.

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12832

----------------------------------------------------------------------------

diff --git a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp 
b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
index 5d14246..b162459 100644
--- a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
+++ b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
@@ -42,7 +42,7 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char * 
printerName)
 
        int32 lastPage;
        fSetupMsg->FindInt32("last_page", &lastPage);
-       bool allPages = firstPage == 1 && lastPage == LONG_MAX;
+       bool allPages = firstPage == 1 && lastPage == INT32_MAX;
 
        fAll = new BRadioButton("allPages", "Print all pages",
                new BMessage(ALL_PAGES_MGS));

############################################################################

Commit:      163f9ddfef1b27af508029bd6a4c83f758af8281
URL:         http://cgit.haiku-os.org/haiku/commit/?id=163f9ddfef1b
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sat Jun 25 12:55:50 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:39 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12830

PictureIterator.h: fix header guard spelling

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12830

----------------------------------------------------------------------------

diff --git a/src/add-ons/print/drivers/pdf/source/PictureIterator.h 
b/src/add-ons/print/drivers/pdf/source/PictureIterator.h
index 2a7155f..faeeac3 100644
--- a/src/add-ons/print/drivers/pdf/source/PictureIterator.h
+++ b/src/add-ons/print/drivers/pdf/source/PictureIterator.h
@@ -30,7 +30,7 @@ THE SOFTWARE.
 */
 
 #ifndef _PICTURE_ITERATOR_H
-#define _PICTURE_TIERATOR_H
+#define _PICTURE_ITERATOR_H
 
 #include <AppKit.h>
 #include <InterfaceKit.h>

############################################################################

Revision:    hrev50402
Commit:      1c6c51315e6a17787ce9833c6b5f34b6049ce065
URL:         http://cgit.haiku-os.org/haiku/commit/?id=1c6c51315e6a
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sat Jun 25 12:56:45 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jul 10 15:11:42 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12828

PackageActionHandler.h: fix header guard spelling

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Ticket: #12828

----------------------------------------------------------------------------

diff --git a/src/apps/haikudepot/model/PackageActionHandler.h 
b/src/apps/haikudepot/model/PackageActionHandler.h
index c413014..f8b996e 100644
--- a/src/apps/haikudepot/model/PackageActionHandler.h
+++ b/src/apps/haikudepot/model/PackageActionHandler.h
@@ -4,7 +4,7 @@
  */
 
 #ifndef PACKAGE_ACTION_HANDLER_H
-#define PACkAGE_ACTION_HANDLER_H
+#define PACKAGE_ACTION_HANDLER_H
 
 
 #include <SupportDefs.h>


Other related posts:

  • » [haiku-commits] haiku: hrev50402 - in src: tools/fs_shell servers/app/decorator add-ons/print/drivers/preview kits/tracker add-ons/print/drivers/pcl6 - pulkomandy