[Libreoffice-commits] core.git: 2 commits - hwpfilter/source vcl/inc

[Michael Stahl]

 hwpfilter/source/grammar.cxx |    9 +++------
 vcl/inc/unx/cpdmgr.hxx       |    6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit f7c3d1a1a75c68147641caee805d36b847c23fab
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 18 14:03:25 2017 +0200

    vcl: [loplugin:reservedid]
    
    Change-Id: I47d4322f094456761e497b3ca5feb5a5dfc73704

diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index de8aab4547ce..dea353384f1b 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -25,6 +25,9 @@
 
 #if ENABLE_DBUS && ENABLE_GIO
 #include <gio/gio.h>
+#else
+typedef struct _GDBusProxy GDBusProxy;
+typedef struct _GDBusConnection GDBusConnection;
 #endif
 
 #include "printerinfomanager.hxx"
@@ -34,9 +37,6 @@
 #define FRONTEND_INTERFACE "/usr/share/dbus-1/interfaces/org.openprinting.Frontend.xml"
 #define BACKEND_INTERFACE "/usr/share/dbus-1/interfaces/org.openprinting.Backend.xml"
 
-typedef struct _GDBusProxy GDBusProxy;
-typedef struct _GDBusConnection GDBusConnection;
-
 namespace psp
 {
 
commit 629661de4a804bebaf2368adb865d14d04fa81ce
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 18 13:51:21 2017 +0200

    hwpfilter: [loplugin:redundantcast]
    
    Change-Id: Ib8fbe3babc9eb2b0b1125de62b0b8012ac710889

diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index a3ce4d3a8253..8c593a01315a 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -572,15 +572,12 @@ yynewstate:
     yystacksize = YYMAXDEPTH;
       yyfree_stacks = 1;
       yyss = static_cast<short *>(malloc (yystacksize * sizeof (*yyssp)));
-      memcpy (yyss, yyss1,
-           size * (unsigned int) sizeof (*yyssp));
+      memcpy (yyss, yyss1, size * sizeof (*yyssp));
       yyvs = static_cast<YYSTYPE *>(malloc (yystacksize * sizeof (*yyvsp)));
-      memcpy (yyvs, yyvs1,
-           size * (unsigned int) sizeof (*yyvsp));
+      memcpy (yyvs, yyvs1, size * sizeof (*yyvsp));
 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) malloc (yystacksize * sizeof (*yylsp));
-      memcpy ((char *)yyls, (char *)yyls1,
-           size * (unsigned int) sizeof (*yylsp));
+      memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
 #endif
 #endif /* no yyoverflow */