[haiku-commits] haiku: hrev47062 - src/bin/desklink build/jam

  • From: js-haiku-commits@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 27 Mar 2014 20:37:41 +0100 (CET)

hrev47062 adds 1 changeset to branch 'master'
old head: c8127e2b7d6e3e8497a38cb084301b0876aa15c5
new head: 4626c49e32af4a2a321090703506c8cf7440bf41
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=4626c49+%5Ec8127e2

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

4626c49: desklink: Fix %ld being used instead of B_PRId32
  
  Also enables -Werror.

                                     [ Jonathan Schleifer <js@xxxxxxxxxxx> ]

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

Revision:    hrev47062
Commit:      4626c49e32af4a2a321090703506c8cf7440bf41
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4626c49
Author:      Jonathan Schleifer <js@xxxxxxxxxxx>
Date:        Thu Mar 27 15:46:57 2014 UTC

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

3 files changed, 6 insertions(+), 5 deletions(-)
build/jam/ArchitectureRules        | 1 +
src/bin/desklink/VolumeControl.cpp | 2 +-
src/bin/desklink/desklink.cpp      | 8 ++++----

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

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 375e0c4..d2a12fd 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -669,6 +669,7 @@ rule ArchitectureSetupWarnings architecture
        EnableWerror src add-ons translators tiff ;
 #      EnableWerror src add-ons translators wonderbrush ;
        EnableWerror src add-ons print ;
+       EnableWerror src bin desklink ;
        EnableWerror src bin multiuser ;
        EnableWerror src bin package ;
        EnableWerror src bin package_repo ;
diff --git a/src/bin/desklink/VolumeControl.cpp 
b/src/bin/desklink/VolumeControl.cpp
index 8e78070..8983830 100644
--- a/src/bin/desklink/VolumeControl.cpp
+++ b/src/bin/desklink/VolumeControl.cpp
@@ -395,7 +395,7 @@ VolumeControl::UpdateText() const
        if (!IsEnabled())
                return NULL;
 
-       fText.SetToFormat(B_TRANSLATE("%ld dB"), Value());
+       fText.SetToFormat(B_TRANSLATE("%" B_PRId32 " dB"), Value());
        return fText.String();
 }
 
diff --git a/src/bin/desklink/desklink.cpp b/src/bin/desklink/desklink.cpp
index 0dd4030..89d39cf 100644
--- a/src/bin/desklink/desklink.cpp
+++ b/src/bin/desklink/desklink.cpp
@@ -55,7 +55,7 @@ main(int, char **argv)
                        while (found < count) {
                                const char *name = NULL;
                                if (deskbar.GetItemInfo(j, &name) == B_OK) {
-                                       printf("Item %ld: '%s'\n", j, name);
+                                       printf("Item %" B_PRId32 ": '%s'\n", j, 
name);
                                        free((void *)name);
                                        found++;
                                }
@@ -95,13 +95,13 @@ main(int, char **argv)
                        while (deskbar.GetItemInfo(replicant.String(), 
&found_id) == B_OK) {
                                err = deskbar.RemoveItem(found_id);
                                if (err != B_OK) {
-                                       printf("desklink: Error removing 
replicant id %ld: %s\n",
-                                               found_id, strerror(err));
+                                       printf("desklink: Error removing 
replicant id "
+                                               "%" B_PRId32 ": %s\n", 
found_id, strerror(err));
                                        break;
                                }
                                found++;
                        }
-                       printf("Removed %ld items.\n", found);
+                       printf("Removed %" B_PRId32 " items.\n", found);
                        return err;
                }
 


Other related posts:

  • » [haiku-commits] haiku: hrev47062 - src/bin/desklink build/jam - js-haiku-commits