From eddec292d5dd8251a00851880e16e6a5c07c1e3f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 21 Jul 2010 21:43:20 +0000 Subject: [PATCH] * applied patch by kaliber that fixes more than 100 warnings - thanks a lot! Closes #6349 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37670 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 208 +++++++++++++++++- headers/os/drivers/config_manager.h | 2 + .../private/graphics/matrox/DriverInterface.h | 2 +- .../graphics/neomagic/DriverInterface.h | 2 +- src/add-ons/accelerants/ati/rage128_dpms.cpp | 4 +- src/add-ons/accelerants/ati/rage128_init.cpp | 8 +- src/add-ons/accelerants/ati/rage128_mode.cpp | 6 +- src/add-ons/accelerants/neomagic/acc_std.h | 1 + src/add-ons/accelerants/nvidia/acc_std.h | 1 + .../accelerants/nvidia/engine/nv_std.h | 1 + src/add-ons/accelerants/s3/savage_init.cpp | 2 +- .../devices/wacom/MasterServerDevice.cpp | 2 +- .../shortcut_catcher/CommandActuators.cpp | 4 +- .../input_server/methods/canna/canna/RK.h | 2 +- .../input_server/methods/canna/lib/canna.h | 2 +- .../input_server/methods/canna/rk/RKintern.h | 2 +- .../kernel/bus_managers/firewire/firewire.c | 1 - .../kernel/bus_managers/firewire/util.c | 2 +- .../kernel/bus_managers/ps2/ps2_keyboard.cpp | 2 +- .../kernel/bus_managers/scsi/devices.c | 2 +- .../drivers/audio/echo/generic/CEchoGalsMTC.h | 2 +- src/add-ons/kernel/drivers/dvb/cx23882/util.c | 2 +- .../kernel/drivers/graphics/common/log_dump.h | 1 + .../drivers/network/ar81xx/dev/ale/if_ale.c | 2 +- .../drivers/printer/usb/usb_printer.cpp | 2 +- src/add-ons/kernel/drivers/tty/driver.cpp | 4 +- .../kernel/generic/ata_adapter/ata_adapter.c | 2 - .../network/protocols/tcp/TCPEndpoint.cpp | 4 +- .../partitioning_systems/session/Debug.h | 1 - .../match_header/ConfigView.cpp | 2 +- .../spam_filter/SpamFilterConfig.cpp | 4 +- .../media/media-add-ons/dvb/DVBMediaNode.cpp | 2 +- .../firewire_dv/FireWireCard.cpp | 2 +- .../firewire_dv/FireWireDVAddOn.cpp | 2 +- .../media/media-add-ons/mixer/MixerAddOn.cpp | 4 +- .../multi_audio/MultiAudioAddOn.cpp | 2 +- .../multi_audio/MultiAudioAddOn.h | 2 +- .../opensound/OpenSoundAddOn.cpp | 2 +- .../opensound/OpenSoundDeviceMixer.cpp | 4 - .../media-add-ons/opensound/OpenSoundNode.cpp | 12 +- .../tone_producer_demo/ToneProducerAddOn.cpp | 4 +- .../addons/quickcam/QuickCamDevice.cpp | 8 - .../video_producer_demo/AddOn.cpp | 4 +- .../media/plugins/asf_reader/asf_reader.cpp | 2 +- .../media/plugins/ogg/OggReaderPlugin.cpp | 1 - src/add-ons/media/plugins/ogg/OggSeekable.cpp | 2 +- .../print/drivers/pdf/source/AboutText.cpp | 2 + src/add-ons/translators/exr/EXRTranslator.cpp | 2 +- src/add-ons/translators/gif/GIFSave.cpp | 2 +- src/add-ons/translators/gif/Prefs.cpp | 8 +- src/add-ons/translators/gif/Prefs.h | 8 +- src/add-ons/translators/ico/ICOTranslator.cpp | 2 +- src/add-ons/translators/jpeg/exif_parser.cpp | 2 +- src/apps/cdplayer/CDDBSupport.cpp | 2 +- .../addons/AudioAdapter/AudioAdapterAddOn.cpp | 4 +- .../cortex/addons/Flanger/FlangerAddOn.cpp | 4 +- src/apps/deskbar/BeMenu.cpp | 5 +- src/apps/deskbar/ResourceSet.cpp | 2 +- src/apps/deskbar/TeamMenuItem.cpp | 2 +- src/apps/deskbar/WindowMenuItem.cpp | 6 +- src/apps/deskcalc/CalcApplication.cpp | 2 +- .../icon-o-matic/generic/gui/ListViews.cpp | 4 +- .../gui/panel/color_picker/ColorField.cpp | 3 +- .../gui/panel/color_picker/ColorField.h | 2 +- .../gui/panel/color_picker/ColorSlider.cpp | 3 +- src/apps/launchbox/IconButton.cpp | 4 +- src/apps/mail/Content.cpp | 2 +- src/apps/mediaplayer/playlist/ListViews.cpp | 4 +- src/apps/poorman/PoorManServer.cpp | 8 +- src/apps/processcontroller/IconMenuItem.cpp | 2 +- src/apps/showimage/Filter.cpp | 2 +- src/apps/soundrecorder/TrackSlider.cpp | 2 +- src/kits/mail/MailAttachment.cpp | 2 +- src/kits/mail/MailChain.cpp | 4 +- src/kits/mail/MailComponent.cpp | 4 +- src/kits/media/MediaTrack.cpp | 2 +- src/kits/tracker/TrackerString.cpp | 6 +- src/servers/mail/DeskbarView.cpp | 2 +- 78 files changed, 318 insertions(+), 126 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 96c01b140f..3dfb04a7c6 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -1170,25 +1170,221 @@ if $(HAIKU_GCC_VERSION[1]) = 2 { } if $(HAIKU_NO_WERROR) != 1 { + EnableWerror src add-ons accelerants 3dfx ; + EnableWerror src add-ons accelerants ati ; + EnableWerror src add-ons accelerants common ; + EnableWerror src add-ons accelerants et6x00 ; +# EnableWerror src add-ons accelerants intel_extreme ; +# EnableWerror src add-ons accelerants matrox ; + EnableWerror src add-ons accelerants neomagic ; +# EnableWerror src add-ons accelerants nvidia ; + EnableWerror src add-ons accelerants nvidia_gpgpu ; +# EnableWerror src add-ons accelerants radeon ; + EnableWerror src add-ons accelerants radeon_hd ; + EnableWerror src add-ons accelerants s3 ; + EnableWerror src add-ons accelerants skeleton ; + EnableWerror src add-ons accelerants vesa ; + EnableWerror src add-ons accelerants via ; + EnableWerror src add-ons accelerants vmware ; + EnableWerror src add-ons bluetooth ; + EnableWerror src add-ons decorators ; + EnableWerror src add-ons disk_systems ; + EnableWerror src add-ons input_server devices ; +# EnableWerror src add-ons input_server filters ; +# EnableWerror src add-ons input_server methods ; +# EnableWerror src add-ons kernel bus_managers acpi ; + EnableWerror src add-ons kernel bus_managers agp_gart ; + EnableWerror src add-ons kernel bus_managers ata ; + EnableWerror src add-ons kernel bus_managers config_manager ; + EnableWerror src add-ons kernel bus_managers firewire ; + EnableWerror src add-ons kernel bus_managers isa ; + EnableWerror src add-ons kernel bus_managers pci ; +# EnableWerror src add-ons kernel bus_managers ps2 ; # gcc2 + EnableWerror src add-ons kernel bus_managers scsi ; + EnableWerror src add-ons kernel bus_managers usb ; + EnableWerror src add-ons kernel busses agp_gart ; + EnableWerror src add-ons kernel busses ata ; + EnableWerror src add-ons kernel busses scsi ; + EnableWerror src add-ons kernel busses usb ; + EnableWerror src add-ons kernel console ; + EnableWerror src add-ons kernel cpu ; +# EnableWerror src add-ons kernel debugger ; # gcc2 +# EnableWerror src add-ons kernel drivers audio ; + EnableWerror src add-ons kernel drivers bluetooth ; + EnableWerror src add-ons kernel drivers bus ; + EnableWerror src add-ons kernel drivers common ; + EnableWerror src add-ons kernel drivers disk ; + EnableWerror src add-ons kernel drivers dvb ; +# EnableWerror src add-ons kernel drivers graphics ; +# EnableWerror src add-ons kernel drivers input ; + EnableWerror src add-ons kernel drivers joystick ; + EnableWerror src add-ons kernel drivers midi ; + EnableWerror src add-ons kernel drivers misc ; +# EnableWerror src add-ons kernel drivers network ; + EnableWerror src add-ons kernel drivers ports ; +# EnableWerror src add-ons kernel drivers power ; + EnableWerror src add-ons kernel drivers printer ; + EnableWerror src add-ons kernel drivers random ; + EnableWerror src add-ons kernel drivers tty ; + EnableWerror src add-ons kernel drivers video ; EnableWerror src add-ons kernel file_systems bfs ; + EnableWerror src add-ons kernel file_systems cdda ; +# EnableWerror src add-ons kernel file_systems ext2 ; +# EnableWerror src add-ons kernel file_systems fat ; +# EnableWerror src add-ons kernel file_systems googlefs ; + EnableWerror src add-ons kernel file_systems iso9660 ; + EnableWerror src add-ons kernel file_systems layers ; + EnableWerror src add-ons kernel file_systems netfs ; + EnableWerror src add-ons kernel file_systems nfs ; +# EnableWerror src add-ons kernel file_systems ntfs ; EnableWerror src add-ons kernel file_systems packagefs ; + EnableWerror src add-ons kernel file_systems ramfs ; +# EnableWerror src add-ons kernel file_systems reiserfs ; + EnableWerror src add-ons kernel file_systems udf ; EnableWerror src add-ons kernel file_systems userlandfs ; + EnableWerror src add-ons kernel generic ; + EnableWerror src add-ons kernel network atalink_protocols ; + EnableWerror src add-ons kernel network devices ; + EnableWerror src add-ons kernel network notifications ; + EnableWerror src add-ons kernel network ppp ; +# EnableWerror src add-ons kernel network protocols ; +# EnableWerror src add-ons kernel network stack ; + EnableWerror src add-ons kernel partitioning_systems ; + EnableWerror src add-ons locale ; + EnableWerror src add-ons mail_daemon ; + EnableWerror src add-ons media media-add-ons demultiplexer ; + EnableWerror src add-ons media media-add-ons dvb ; + EnableWerror src add-ons media media-add-ons esound_sink ; + EnableWerror src add-ons media media-add-ons finepix_webcam ; + EnableWerror src add-ons media media-add-ons firewire_dv ; + EnableWerror src add-ons media media-add-ons legacy ; + EnableWerror src add-ons media media-add-ons mixer ; + EnableWerror src add-ons media media-add-ons multi_audio ; + EnableWerror src add-ons media media-add-ons opensound ; + EnableWerror src add-ons media media-add-ons radeon ; + EnableWerror src add-ons media media-add-ons reader ; + EnableWerror src add-ons media media-add-ons tone_producer_demo ; + EnableWerror src add-ons media media-add-ons usb_vision ; +# EnableWerror src add-ons media media-add-ons usb_webcam ; + EnableWerror src add-ons media media-add-ons video_mixer ; +# EnableWerror src add-ons media media-add-ons video_producer_demo ; + EnableWerror src add-ons media media-add-ons videowindow ; + EnableWerror src add-ons media media-add-ons writer ; + EnableWerror src add-ons media plugins ac3_decoder ; + EnableWerror src add-ons media plugins aiff_reader ; + EnableWerror src add-ons media plugins ape_reader ; +# EnableWerror src add-ons media plugins asf_reader ; + EnableWerror src add-ons media plugins au_reader ; +# EnableWerror src add-ons media plugins avi_reader ; +# EnableWerror src add-ons media plugins ffmpeg ; +# EnableWerror src add-ons media plugins matroska ; +# EnableWerror src add-ons media plugins mov_reader ; + EnableWerror src add-ons media plugins mp3_decoder ; +# EnableWerror src add-ons media plugins mp3_reader ; + EnableWerror src add-ons media plugins mp4_reader ; + EnableWerror src add-ons media plugins musepack ; +# EnableWerror src add-ons media plugins ogg ; +# EnableWerror src add-ons media plugins raw_decoder ; +# EnableWerror src add-ons media plugins speex ; + EnableWerror src add-ons media plugins theora ; + EnableWerror src add-ons media plugins vorbis ; +# EnableWerror src add-ons media plugins wav_reader ; + EnableWerror src add-ons media plugins xvid_decoder ; + EnableWerror src add-ons opengl ; + EnableWerror src add-ons print ; + EnableWerror src add-ons screen_savers ; + EnableWerror src add-ons tracker ; + EnableWerror src add-ons translators bmp ; +# EnableWerror src add-ons translators exr ; + EnableWerror src add-ons translators gif ; + EnableWerror src add-ons translators hpgs ; + EnableWerror src add-ons translators hvif ; + EnableWerror src add-ons translators ico ; +# EnableWerror src add-ons translators jpeg ; # gcc2 + EnableWerror src add-ons translators jpeg2000 ; + EnableWerror src add-ons translators pcx ; +# EnableWerror src add-ons translators png ; # gcc2 + EnableWerror src add-ons translators ppm ; + EnableWerror src add-ons translators raw ; + EnableWerror src add-ons translators rtf ; + EnableWerror src add-ons translators sgi ; + EnableWerror src add-ons translators shared ; + EnableWerror src add-ons translators stxt ; + EnableWerror src add-ons translators tga ; + EnableWerror src add-ons translators tiff ; +# EnableWerror src add-ons translators wonderbrush ; +# EnableWerror src add-ons print ; EnableWerror src bin package ; + EnableWerror src apps aboutsystem ; + EnableWerror src apps activitymonitor ; + EnableWerror src apps bootman ; + EnableWerror src apps bsnow ; + EnableWerror src apps cdplayer ; +# EnableWerror src apps charactermap ; + EnableWerror src apps clock ; + EnableWerror src apps codycam ; + EnableWerror src apps cortex ; + EnableWerror src apps deskbar ; + EnableWerror src apps deskcalc ; + EnableWerror src apps devices ; + EnableWerror src apps diskprobe ; +# EnableWerror src apps diskusage ; + EnableWerror src apps drivesetup ; + EnableWerror src apps expander ; + EnableWerror src apps fontdemo ; + EnableWerror src apps glteapot ; + EnableWerror src apps haiku3d ; +# EnableWerror src apps icon-o-matic ; + EnableWerror src apps installer ; + EnableWerror src apps launchbox ; + EnableWerror src apps magnify ; +# EnableWerror src apps mail ; + EnableWerror src apps mandelbrot ; + EnableWerror src apps mediaconverter ; +# EnableWerror src apps mediaplayer ; + EnableWerror src apps midiplayer ; + EnableWerror src apps networkstatus ; + EnableWerror src apps packageinstaller ; + EnableWerror src apps pairs ; + EnableWerror src apps people ; +# EnableWerror src apps poorman ; + EnableWerror src apps powerstatus ; + EnableWerror src apps processcontroller ; + EnableWerror src apps pulse ; + EnableWerror src apps readonlybootprompt ; + EnableWerror src apps screenshot ; + EnableWerror src apps showimage ; + EnableWerror src apps soundrecorder ; + EnableWerror src apps stylededit ; + EnableWerror src apps sudoku ; + EnableWerror src apps terminal ; + EnableWerror src apps text_search ; + EnableWerror src apps tracker ; + EnableWerror src apps tv ; + EnableWerror src apps workspaces ; EnableWerror src kits app ; + EnableWerror src kits bluetooth ; + EnableWerror src kits debug ; EnableWerror src kits device ; + EnableWerror src kits game ; EnableWerror src kits interface ; +# EnableWerror src kits locale ; + EnableWerror src kits mail ; +# EnableWerror src kits media ; # gcc2 EnableWerror src kits midi ; EnableWerror src kits midi2 ; + EnableWerror src kits network ; + EnableWerror src kits notification ; + EnableWerror src kits opengl ; EnableWerror src kits print ; + EnableWerror src kits screensaver ; + EnableWerror src kits shared ; EnableWerror src kits storage ; EnableWerror src kits support ; + EnableWerror src kits textencoding ; +# EnableWerror src kits tracker ; EnableWerror src kits translation ; - EnableWerror src servers cddb_daemon ; - EnableWerror src servers debug ; - EnableWerror src servers input ; - EnableWerror src servers midi ; - EnableWerror src servers print ; - EnableWerror src servers registrar ; + EnableWerror src servers ; EnableWerror src system kernel ; EnableWerror src system runtime_loader ; } diff --git a/headers/os/drivers/config_manager.h b/headers/os/drivers/config_manager.h index e93e27772a..b97a4e761c 100644 --- a/headers/os/drivers/config_manager.h +++ b/headers/os/drivers/config_manager.h @@ -106,6 +106,8 @@ typedef struct config_manager_for_driver_module_info { uint32 len); } config_manager_for_driver_module_info; +int config_manager_scan_hardcoded(struct device_info **info, int32 *count); + #define B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME "bus_managers/config_manager/driver/v1" #ifdef __cplusplus diff --git a/headers/private/graphics/matrox/DriverInterface.h b/headers/private/graphics/matrox/DriverInterface.h index b012d88db5..e40d46f5de 100644 --- a/headers/private/graphics/matrox/DriverInterface.h +++ b/headers/private/graphics/matrox/DriverInterface.h @@ -187,7 +187,7 @@ typedef struct { G400MAX, G450, G550 - }; + } card_type; struct { /* specialised registers for card initialisation read from MGA BIOS (pins) */ diff --git a/headers/private/graphics/neomagic/DriverInterface.h b/headers/private/graphics/neomagic/DriverInterface.h index efa51b5fed..ba4e3a8365 100644 --- a/headers/private/graphics/neomagic/DriverInterface.h +++ b/headers/private/graphics/neomagic/DriverInterface.h @@ -179,7 +179,7 @@ typedef struct { NM2230, NM2360, NM2380 - }; + } card_type; struct { /* specialised registers for predefined cardspecs */ diff --git a/src/add-ons/accelerants/ati/rage128_dpms.cpp b/src/add-ons/accelerants/ati/rage128_dpms.cpp index 41edd9b970..11cec3cb37 100644 --- a/src/add-ons/accelerants/ati/rage128_dpms.cpp +++ b/src/add-ons/accelerants/ati/rage128_dpms.cpp @@ -72,13 +72,13 @@ Rage128_SetDPMSMode(uint32 dpmsMode) case B_DPMS_STAND_BY: // Screen: Off; HSync: Off, VSync: On. OUTREGM(R128_CRTC_EXT_CNTL, - R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS, mask); + (R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS), mask); break; case B_DPMS_SUSPEND: // Screen: Off; HSync: On, VSync: Off. OUTREGM(R128_CRTC_EXT_CNTL, - R128_CRTC_DISPLAY_DIS | R128_CRTC_VSYNC_DIS, mask); + (R128_CRTC_DISPLAY_DIS | R128_CRTC_VSYNC_DIS), mask); break; case B_DPMS_OFF: diff --git a/src/add-ons/accelerants/ati/rage128_init.cpp b/src/add-ons/accelerants/ati/rage128_init.cpp index bdb74e28ac..328e8c0baf 100644 --- a/src/add-ons/accelerants/ati/rage128_init.cpp +++ b/src/add-ons/accelerants/ati/rage128_init.cpp @@ -21,10 +21,10 @@ // Memory Specifications from RAGE 128 Software Development Manual // (Technical Reference Manual P/N SDK-G04000 Rev 0.01), page 3-21. static R128_RAMSpec sRAMSpecs[] = { - { 4, 4, 3, 3, 1, 3, 1, 16, 12, "128-bit SDR SGRAM 1:1" }, - { 4, 8, 3, 3, 1, 3, 1, 17, 13, "64-bit SDR SGRAM 1:1" }, - { 4, 4, 1, 2, 1, 2, 1, 16, 12, "64-bit SDR SGRAM 2:1" }, - { 4, 4, 3, 3, 2, 3, 1, 16, 12, "64-bit DDR SGRAM" }, + { 4, 4, 3, 3, 1, 3, 1, 16, 12, (char *)"128-bit SDR SGRAM 1:1" }, + { 4, 8, 3, 3, 1, 3, 1, 17, 13, (char *)"64-bit SDR SGRAM 1:1" }, + { 4, 4, 1, 2, 1, 2, 1, 16, 12, (char *)"64-bit SDR SGRAM 2:1" }, + { 4, 4, 3, 3, 2, 3, 1, 16, 12, (char *)"64-bit DDR SGRAM" }, }; diff --git a/src/add-ons/accelerants/ati/rage128_mode.cpp b/src/add-ons/accelerants/ati/rage128_mode.cpp index 31a316dda6..6134991032 100644 --- a/src/add-ons/accelerants/ati/rage128_mode.cpp +++ b/src/add-ons/accelerants/ati/rage128_mode.cpp @@ -304,7 +304,7 @@ SetRegisters(DisplayParams& params) OUTREG(R128_CRTC_GEN_CNTL, params.crtc_gen_cntl); - OUTREGM(R128_DAC_CNTL, R128_DAC_MASK_ALL | R128_DAC_8BIT_EN, + OUTREGM(R128_DAC_CNTL, (R128_DAC_MASK_ALL | R128_DAC_8BIT_EN), ~(R128_DAC_RANGE_CNTL | R128_DAC_BLANKING)); OUTREG(R128_CRTC_H_TOTAL_DISP, params.crtc_h_total_disp); @@ -393,7 +393,7 @@ Rage128_SetDisplayMode(const DisplayModeEx& mode) // Select primary monitor and enable 8-bit color. OUTREGM(R128_DAC_CNTL, R128_DAC_8BIT_EN, - R128_DAC_PALETTE_ACC_CTL | R128_DAC_8BIT_EN); + (R128_DAC_PALETTE_ACC_CTL | R128_DAC_8BIT_EN)); OUTREG8(R128_PALETTE_INDEX, 0); // set first color index for (int i = 0; i < 256; i++) @@ -436,7 +436,7 @@ Rage128_SetIndexedColors(uint count, uint8 first, uint8* colorData, uint32 flags // Select primary monitor and enable 8-bit color. OUTREGM(R128_DAC_CNTL, R128_DAC_8BIT_EN, - R128_DAC_PALETTE_ACC_CTL | R128_DAC_8BIT_EN); + (R128_DAC_PALETTE_ACC_CTL | R128_DAC_8BIT_EN)); OUTREG8(R128_PALETTE_INDEX, first); // set first color index while (count--) { diff --git a/src/add-ons/accelerants/neomagic/acc_std.h b/src/add-ons/accelerants/neomagic/acc_std.h index 3319313662..0ebdbcbfd8 100644 --- a/src/add-ons/accelerants/neomagic/acc_std.h +++ b/src/add-ons/accelerants/neomagic/acc_std.h @@ -7,6 +7,7 @@ #define GLOBALDATA_H #include +#include #include #include "DriverInterface.h" #include "nm_globals.h" diff --git a/src/add-ons/accelerants/nvidia/acc_std.h b/src/add-ons/accelerants/nvidia/acc_std.h index 273b055bfe..c72240683d 100644 --- a/src/add-ons/accelerants/nvidia/acc_std.h +++ b/src/add-ons/accelerants/nvidia/acc_std.h @@ -7,6 +7,7 @@ #define GLOBALDATA_H #include +#include #include /* DDC/EDID library */ diff --git a/src/add-ons/accelerants/nvidia/engine/nv_std.h b/src/add-ons/accelerants/nvidia/engine/nv_std.h index c3e84f0cbd..86de869115 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_std.h +++ b/src/add-ons/accelerants/nvidia/engine/nv_std.h @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/src/add-ons/accelerants/s3/savage_init.cpp b/src/add-ons/accelerants/s3/savage_init.cpp index 55983918b0..56c002f78d 100644 --- a/src/add-ons/accelerants/s3/savage_init.cpp +++ b/src/add-ons/accelerants/s3/savage_init.cpp @@ -122,7 +122,7 @@ Savage_GetPanelInfo() if (panelX == 1408) panelX = 1400; - char* sTechnology; + const char* sTechnology; if ((ReadSeqReg(0x39) & 0x03) == 0) sTechnology = "TFT"; diff --git a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp index 0300fff754..4c3675d63f 100644 --- a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp +++ b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp @@ -70,7 +70,7 @@ MasterServerDevice::~MasterServerDevice() status_t MasterServerDevice::InitCheck() { - input_device_ref device = { "Wacom Tablets", + input_device_ref device = { (char *)"Wacom Tablets", B_POINTING_DEVICE, (void*)this }; input_device_ref* deviceList[2] = { &device, NULL }; RegisterDevices(deviceList); diff --git a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp index 0bf96af83c..af53a9d314 100644 --- a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp +++ b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp @@ -589,10 +589,10 @@ KeyStrokeSequenceCommandActuator::KeyStrokeSequenceCommandActuator(int32 argc, } // If we have a letter, try to make it the correct case - if ((unicodeVal >= 'A') && (unicodeVal <= 'Z')) + if ((unicodeVal >= 'A') && (unicodeVal <= 'Z')) { if ((customMods &B_SHIFT_KEY) == 0) unicodeVal += 'a'-'A'; - else if ((unicodeVal >= 'a') && (unicodeVal <= 'z')) + } else if ((unicodeVal >= 'a') && (unicodeVal <= 'z')) if ((customMods &B_SHIFT_KEY) != 0) unicodeVal -= 'a'-'A'; } else { diff --git a/src/add-ons/input_server/methods/canna/canna/RK.h b/src/add-ons/input_server/methods/canna/canna/RK.h index 00bdb47196..e3811fbda5 100644 --- a/src/add-ons/input_server/methods/canna/canna/RK.h +++ b/src/add-ons/input_server/methods/canna/canna/RK.h @@ -23,7 +23,7 @@ /* $Id: RK.h 10527 2004-12-23 22:08:39Z korli $ */ /************************************************************************/ -/* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997 +/* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997 */ /************************************************************************/ #ifndef _RK_h diff --git a/src/add-ons/input_server/methods/canna/lib/canna.h b/src/add-ons/input_server/methods/canna/lib/canna.h index 3642af939c..cf61768942 100644 --- a/src/add-ons/input_server/methods/canna/lib/canna.h +++ b/src/add-ons/input_server/methods/canna/lib/canna.h @@ -25,7 +25,7 @@ */ /************************************************************************/ -/* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997 +/* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997 */ /************************************************************************/ diff --git a/src/add-ons/input_server/methods/canna/rk/RKintern.h b/src/add-ons/input_server/methods/canna/rk/RKintern.h index 51c6a7b46a..370d5442ee 100644 --- a/src/add-ons/input_server/methods/canna/rk/RKintern.h +++ b/src/add-ons/input_server/methods/canna/rk/RKintern.h @@ -23,7 +23,7 @@ /* LINTLIBRARY */ /* $Id: RKintern.h 10525 2004-12-23 21:23:50Z korli $ */ /************************************************************************/ -/* THIS SOURCE CODE IS MODIFIED FOR kanBe BY T.MURAI 1997 +/* THIS SOURCE CODE IS MODIFIED FOR kanBe BY T.MURAI 1997 */ /************************************************************************/ #ifndef _RKintern_h #define _RKintern_h diff --git a/src/add-ons/kernel/bus_managers/firewire/firewire.c b/src/add-ons/kernel/bus_managers/firewire/firewire.c index 0bfa0dbd0b..2a928230fb 100644 --- a/src/add-ons/kernel/bus_managers/firewire/firewire.c +++ b/src/add-ons/kernel/bus_managers/firewire/firewire.c @@ -1096,7 +1096,6 @@ static struct fw_xfer * fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel, int tcode) { struct fw_xfer *xfer; - int s = splfw(); int req; mtx_lock(&fc->tlabel_lock); diff --git a/src/add-ons/kernel/bus_managers/firewire/util.c b/src/add-ons/kernel/bus_managers/firewire/util.c index b75f1dfe10..34fd895069 100644 --- a/src/add-ons/kernel/bus_managers/firewire/util.c +++ b/src/add-ons/kernel/bus_managers/firewire/util.c @@ -65,7 +65,7 @@ alloc_mem(void **virt, void **phy, size_t size, uint32 protection, *virt = virtadr; if (phy) *phy = (void*)(addr_t)pe.address; - TRACE("area = %ld, size = %ld, virt = %p, phy = %p\n", area, size, virtadr, + TRACE("area = %ld, size = %ld, virt = %p, phy = %" B_PRIxPHYSADDR "\n", area, size, virtadr, pe.address); return area; } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp index 86b0f5a1b6..0eb8fcb17c 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp @@ -34,7 +34,7 @@ enum { LED_SCROLL = 1, LED_NUM = 2, LED_CAPS = 4 -} leds_status; +}; enum { EXTENDED_KEY = 0xe0, diff --git a/src/add-ons/kernel/bus_managers/scsi/devices.c b/src/add-ons/kernel/bus_managers/scsi/devices.c index a38c3781b1..d7cfc6e721 100644 --- a/src/add-ons/kernel/bus_managers/scsi/devices.c +++ b/src/add-ons/kernel/bus_managers/scsi/devices.c @@ -204,7 +204,7 @@ static status_t scsi_create_autosense_request(scsi_device_info *device) { scsi_ccb *request; - char *buffer; + unsigned char *buffer; scsi_cmd_request_sense *cmd; size_t total_size; diff --git a/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h b/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h index c713adaf9c..74ea0c2c69 100644 --- a/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h +++ b/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h @@ -75,6 +75,6 @@ protected: }; // class CEchoGalsMTC -#endif _CECHOGALSMTC_H_ +#endif // _CECHOGALSMTC_H_ // *** CEchoGalsMTC.H *** diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/util.c b/src/add-ons/kernel/drivers/dvb/cx23882/util.c index 4b3f74266c..77da6534c0 100644 --- a/src/add-ons/kernel/drivers/dvb/cx23882/util.c +++ b/src/add-ons/kernel/drivers/dvb/cx23882/util.c @@ -98,6 +98,6 @@ alloc_mem(void **virt, void **phy, size_t size, uint32 protection, *virt = virtadr; if (phy) *phy = (void*)(addr_t)pe.address; - TRACE("area = %ld, size = %ld, virt = %p, phy = %p\n", areaid, size, virtadr, pe.address); + TRACE("area = %ld, size = %ld, virt = %p, phy = %" B_PRIxPHYSADDR "\n", areaid, size, virtadr, pe.address); return areaid; } diff --git a/src/add-ons/kernel/drivers/graphics/common/log_dump.h b/src/add-ons/kernel/drivers/graphics/common/log_dump.h index bb2a775b91..9a49c6796d 100644 --- a/src/add-ons/kernel/drivers/graphics/common/log_dump.h +++ b/src/add-ons/kernel/drivers/graphics/common/log_dump.h @@ -13,5 +13,6 @@ #include void log_printall( FILE *logfile, char *buffer, uint32 buffer_len ); +void log_printentry( FILE *logfile, log_entry *entry ); #endif diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c b/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c index 2442c8d3c1..bad25df411 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c +++ b/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c @@ -426,7 +426,7 @@ ale_attach(device_t dev) struct ale_softc *sc; struct ifnet *ifp; uint16_t burst; - int error, i, msic, msixc, pmc; + int error, i, msic, msixc; uint32_t rxf_len, txf_len; error = 0; diff --git a/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp b/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp index 3fa9fba857..43754e6a7a 100644 --- a/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp +++ b/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp @@ -237,7 +237,7 @@ usb_printer_device_added(usb_device newDevice, void **cookie) if (freeDeviceMask != (uint32)-1) { // reuse device number of first 32 devices for (int32 deviceNumber = 0; deviceNumber < 32; deviceNumber++) { - if (freeDeviceMask & (1 << deviceNumber) == 0) { + if ((freeDeviceMask & (1 << deviceNumber)) == 0) { device->device_number = deviceNumber; break; } diff --git a/src/add-ons/kernel/drivers/tty/driver.cpp b/src/add-ons/kernel/drivers/tty/driver.cpp index 5be40d118b..a8b61a46de 100644 --- a/src/add-ons/kernel/drivers/tty/driver.cpp +++ b/src/add-ons/kernel/drivers/tty/driver.cpp @@ -97,8 +97,8 @@ init_driver(void) } } - gDeviceNames[2 * kNumTTYs] = "ptmx"; - gDeviceNames[2 * kNumTTYs + 1] = "tty"; + gDeviceNames[2 * kNumTTYs] = (char *)"ptmx"; + gDeviceNames[2 * kNumTTYs + 1] = (char *)"tty"; tty_add_debugger_commands(); diff --git a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c index 3501c5f254..320a4219fe 100644 --- a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c +++ b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c @@ -625,8 +625,6 @@ ata_adapter_init_controller(device_node *node, pci_device *device; ata_adapter_controller_info *controller; uint16 bus_master_base; - uint16 pcicmdOld; - uint16 pcicmdNew; // get device data if (sDeviceManager->get_attr_uint16(node, ATA_ADAPTER_BUS_MASTER_BASE, &bus_master_base, false) != B_OK) diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp index e9f04b468f..bb827ec3f3 100644 --- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp @@ -1566,9 +1566,9 @@ TCPEndpoint::_Receive(tcp_segment_header& segment, net_buffer* buffer) if ((segment.flags & TCP_FLAG_SYNCHRONIZE) != 0 || (fState == SYNCHRONIZE_RECEIVED && (fInitialReceiveSequence > segment.sequence - || (segment.flags & TCP_FLAG_ACKNOWLEDGE) != 0 + || ((segment.flags & TCP_FLAG_ACKNOWLEDGE) != 0 && (fSendUnacknowledged > segment.acknowledge - || fSendMax < segment.acknowledge)))) { + || fSendMax < segment.acknowledge))))) { // reset the connection - either the initial SYN was faulty, or we // received a SYN within the data stream return DROP | RESET; diff --git a/src/add-ons/kernel/partitioning_systems/session/Debug.h b/src/add-ons/kernel/partitioning_systems/session/Debug.h index fcec3776ce..9020461a1c 100644 --- a/src/add-ons/kernel/partitioning_systems/session/Debug.h +++ b/src/add-ons/kernel/partitioning_systems/session/Debug.h @@ -212,7 +212,6 @@ private: #define SIMPLE_PRINT(x) ; #define PRINT_INDENT(x) ; #define PRINT_DIVIDER() ; - #define DUMP(object) ; #define PDUMP(objectPointer) ; #define REPORT_ERROR(status) ; #define RETURN_ERROR(status) return status; diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp b/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp index 1526264893..6c9636af22 100644 --- a/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp @@ -132,7 +132,7 @@ void RuleFilterConfig::MessageReceived(BMessage *msg) { { case kMsgActionMoveTo: case kMsgActionSetTo: - if (BControl *control = (BControl *)arg->FindView("file_path")) + if (arg->FindView("file_path")) arg->SetEnabled(true); if (BControl *control = (BControl *)arg->FindView("select_file")) control->SetEnabled(msg->what == kMsgActionMoveTo); diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp index 74420a41f1..282ba9dc00 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp @@ -209,7 +209,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow () tempRect.right = fNoWordsMeansSpamCheckBoxPntr->Frame().left - be_plain_font->StringWidth ("a"); - tempStringPntr = "Spam above:"; + tempStringPntr = (char *)"Spam above:"; sprintf (numberString, "%06.4f", (double) fSpamCutoffRatio); fSpamCutoffRatioTextBoxPntr = new BTextControl ( tempRect, @@ -228,7 +228,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow () // Add the box displaying the genuine cutoff ratio, on a line by itself. - tempStringPntr = "Genuine below and uncertain above:"; + tempStringPntr = (char *)"Genuine below and uncertain above:"; sprintf (numberString, "%08.6f", (double) fGenuineCutoffRatio); fGenuineCutoffRatioTextBoxPntr = new BTextControl ( tempRect, diff --git a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp index 4ea96f18e4..3eb888388b 100644 --- a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp +++ b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp @@ -1099,6 +1099,7 @@ DVBMediaNode::Tune() fSelectedState, fSelectedRegion, fSelectedChannel, fSelectedAudio); status_t err; + bool needs_tuning = false; if (fSelectedChannel < 0 || fSelectedAudio < 0) { printf("DVBMediaNode::Tune: invalid tuning info\n"); @@ -1135,7 +1136,6 @@ DVBMediaNode::Tune() return B_OK; } */ - bool needs_tuning; switch (fInterfaceType) { case DVB_TYPE_DVB_T: needs_tuning = (fTuningParam.u.dvb_t.frequency != new_params.u.dvb_t.frequency) || !fTuningSuccess; diff --git a/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp b/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp index b1cffb5181..e69f19a980 100644 --- a/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp +++ b/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp @@ -75,7 +75,7 @@ struct frac pad_rate[2] = { {203, 2997}, /* = (8000 - 29.97 * 250)/(29.97 * 250) */ {1, 15}, /* = (8000 - 25 * 300)/(25 * 300) */ }; -char *system_name[] = {"NTSC", "PAL"}; +char *system_name[] = {(char *)"NTSC", (char *)"PAL"}; int frame_rate[] = {30, 25}; #define DV_PSIZE 512 diff --git a/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp b/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp index 936d828618..436b6a4325 100644 --- a/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp +++ b/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp @@ -171,7 +171,7 @@ FireWireDVAddOn::AddDevice(FireWireCard* card, const char* path) // setup flavor info dev->flavor.name = dev->name; - dev->flavor.info = "The FireWireDVNode outputs to fw_raw drivers."; + dev->flavor.info = (char *)"The FireWireDVNode outputs to fw_raw drivers."; dev->flavor.kinds = B_BUFFER_CONSUMER | B_BUFFER_PRODUCER | B_CONTROLLABLE | B_PHYSICAL_OUTPUT | B_PHYSICAL_INPUT; dev->flavor.flavor_flags = B_FLAVOR_IS_GLOBAL; diff --git a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp index cb66ab0998..18c6eec252 100644 --- a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp +++ b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp @@ -34,8 +34,8 @@ AudioMixerAddon::AudioMixerAddon(image_id image) fFormat->u.raw_audio = media_raw_audio_format::wildcard; fInfo->internal_id = 0; - fInfo->name = "Audio Mixer (Haiku)"; - fInfo->info = "Haiku Audio Mixer media addon"; + fInfo->name = (char *)"Audio Mixer (Haiku)"; + fInfo->info = (char *)"Haiku Audio Mixer media addon"; fInfo->kinds = B_BUFFER_PRODUCER | B_BUFFER_CONSUMER | B_SYSTEM_MIXER | B_CONTROLLABLE; fInfo->flavor_flags = 0; // 0 = global or local instantiation allowed, no restrictions fInfo->possible_count = 0; // 0 = infinite diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp index 9b2d364555..1758d0a073 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp @@ -174,7 +174,7 @@ MultiAudioAddOn::AutoStart(int count, BMediaNode** _node, int32* _internalID, status_t -MultiAudioAddOn::_RecursiveScan(char* rootPath, BEntry* rootEntry, uint32 depth) +MultiAudioAddOn::_RecursiveScan(const char* rootPath, BEntry* rootEntry, uint32 depth) { CALLED(); if (depth > 16) diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h index 816b482e79..d0711e031a 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h @@ -30,7 +30,7 @@ public: int32* _internalID, bool* _hasMore); private: - status_t _RecursiveScan(char* path, BEntry* rootEntry = NULL, + status_t _RecursiveScan(const char* path, BEntry* rootEntry = NULL, uint32 depth = 0); void _SaveSettings(); void _LoadSettings(); diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp b/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp index 9de6057b94..1729c19539 100644 --- a/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp +++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp @@ -64,7 +64,7 @@ OpenSoundAddOn::OpenSoundAddOn(image_id image) : fInitCheckStatus = B_NO_INIT; /* unix paths */ - if (RecursiveScan("/dev/oss/") != B_OK) + if (RecursiveScan((char *)"/dev/oss/") != B_OK) return; /* if (RecursiveScan("/dev/audio/oss/") != B_OK) diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp b/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp index f2d8890360..39cc8390aa 100644 --- a/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp +++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp @@ -63,7 +63,6 @@ int OpenSoundDeviceMixer::CountExtInfos() status_t OpenSoundDeviceMixer::GetExtInfo(int index, oss_mixext *info) { - status_t err; CALLED(); if (!info) @@ -84,7 +83,6 @@ status_t OpenSoundDeviceMixer::GetExtInfo(int index, oss_mixext *info) status_t OpenSoundDeviceMixer::GetMixerValue(oss_mixer_value *value) { - status_t err; CALLED(); if (!value) @@ -105,7 +103,6 @@ status_t OpenSoundDeviceMixer::GetMixerValue(oss_mixer_value *value) status_t OpenSoundDeviceMixer::SetMixerValue(oss_mixer_value *value) { - status_t err; CALLED(); if (!value) @@ -126,7 +123,6 @@ status_t OpenSoundDeviceMixer::SetMixerValue(oss_mixer_value *value) status_t OpenSoundDeviceMixer::GetEnumInfo(int index, oss_mixer_enuminfo *info) { - status_t err; CALLED(); if (!info) diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp index 57c595f20d..ed9b026227 100644 --- a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp +++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp @@ -485,9 +485,9 @@ OpenSoundNode::NodeRegistered() mediaInput.destination.port = ControlPort(); mediaInput.destination.id = fInputs.CountItems(); mediaInput.node = Node(); - char *prefix = ""; + char *prefix = (char *)""; if (strstr(engine->Info()->name, "SPDIF")) - prefix = "S/PDIF "; + prefix = (char *)"S/PDIF "; sprintf(mediaInput.name, "%sOutput %ld (%s)", prefix, mediaInput.destination.id, gSupportedFormatsNames[f]); @@ -533,9 +533,9 @@ OpenSoundNode::NodeRegistered() mediaOutput.source.port = ControlPort(); mediaOutput.source.id = fOutputs.CountItems(); mediaOutput.node = Node(); - char *prefix = ""; + char *prefix = (char *)""; if (strstr(engine->Info()->name, "SPDIF")) - prefix = "S/PDIF "; + prefix = (char *)"S/PDIF "; sprintf(mediaOutput.name, "%sInput %ld (%s)", prefix, mediaOutput.source.id, gSupportedFormatsNames[f]); @@ -2672,8 +2672,8 @@ OpenSoundNode::GetFlavor(flavor_info* outInfo, int32 id) outInfo->out_formats = 0; outInfo->internal_id = id; - outInfo->name = "OpenSoundNode Node"; - outInfo->info = "The OpenSoundNode outputs to OpenSound System v4 " + outInfo->name = (char *)"OpenSoundNode Node"; + outInfo->info = (char *)"The OpenSoundNode outputs to OpenSound System v4 " "drivers."; outInfo->kinds = B_BUFFER_CONSUMER | B_BUFFER_PRODUCER | B_TIME_SOURCE | B_PHYSICAL_OUTPUT | B_PHYSICAL_INPUT | B_CONTROLLABLE; diff --git a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp index cd1e302d35..fa63b51333 100644 --- a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp +++ b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp @@ -44,8 +44,8 @@ status_t ToneProducerAddOn::GetFlavorAt( flavor_info* pInfo = new flavor_info; pInfo->internal_id = n; - pInfo->name = "Demo Audio Producer"; - pInfo->info = + pInfo->name = (char *)"Demo Audio Producer"; + pInfo->info = (char *) "An add-on version of the ToneProducer node.\n" "See the Be Developer Newsletter: 2 June, 1999\n" "adapted by Eric Moon (4 June, 1999)"; diff --git a/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp b/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp index e4d39f4c0d..48f59cb8d3 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp +++ b/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp @@ -58,9 +58,6 @@ QuickCamDevice::SupportsIsochronous() status_t QuickCamDevice::StartTransfer() { - status_t err; - uint8 r; - SetScale(1); if (Sensor()) SetVideoFrame(BRect(0, 0, Sensor()->MaxWidth()-1, Sensor()->MaxHeight()-1)); @@ -85,7 +82,6 @@ status_t QuickCamDevice::StopTransfer() { status_t err; - uint8 r; DumpRegs(); err = CamDevice::StopTransfer(); @@ -137,7 +133,6 @@ QuickCamDevice::GetStatusIIC() status_t QuickCamDevice::WaitReadyIIC() { - status_t err; #warning WRITEME return EBUSY; } @@ -146,7 +141,6 @@ QuickCamDevice::WaitReadyIIC() ssize_t QuickCamDevice::WriteIIC(uint8 address, uint8 *data, size_t count) { - status_t err; int i; uint8 buffer[0x23]; if (count > 16) @@ -174,7 +168,6 @@ ssize_t QuickCamDevice::ReadIIC8(uint8 address, uint8 *data) { status_t err; - int i; uint8 buffer[0x23]; memset(buffer, 0, sizeof(buffer)); buffer[0x20] = Sensor() ? Sensor()->IICReadAddress() : 0; @@ -202,7 +195,6 @@ ssize_t QuickCamDevice::ReadIIC16(uint8 address, uint16 *data) { status_t err; - int i; uint8 buffer[0x23]; memset(buffer, 0, sizeof(buffer)); buffer[0x20] = Sensor() ? Sensor()->IICReadAddress() : 0; diff --git a/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp b/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp index e0d8b1a46e..e31709940c 100644 --- a/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp +++ b/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp @@ -15,8 +15,8 @@ MediaAddOn::MediaAddOn(image_id imid) : BMediaAddOn(imid) { /* Customize these parameters to match those of your node */ - fFlavorInfo.name = "Demo Video Producer"; - fFlavorInfo.info = "Demo Video Producer"; + fFlavorInfo.name = (char *)"Demo Video Producer"; + fFlavorInfo.info = (char *)"Demo Video Producer"; fFlavorInfo.kinds = B_BUFFER_PRODUCER | B_CONTROLLABLE; fFlavorInfo.flavor_flags = 0; fFlavorInfo.internal_id = 0; diff --git a/src/add-ons/media/plugins/asf_reader/asf_reader.cpp b/src/add-ons/media/plugins/asf_reader/asf_reader.cpp index af273abd38..a0557b0ac5 100644 --- a/src/add-ons/media/plugins/asf_reader/asf_reader.cpp +++ b/src/add-ons/media/plugins/asf_reader/asf_reader.cpp @@ -294,7 +294,7 @@ asfReader::AllocateCookie(int32 streamNumber, void **_cookie) TRACE("BlockAlign %d\n",audioFormat.BlockAlign); TRACE("Bits %d\n",audioFormat.BitsPerSample); - uint32 sampleSize = (audioFormat.NoChannels * audioFormat.BitsPerSample / 8); + //uint32 sampleSize = (audioFormat.NoChannels * audioFormat.BitsPerSample / 8); cookie->audio = true; cookie->duration = theFileReader->getStreamDuration(streamNumber); diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp b/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp index bdf193c7de..0e4983bba0 100644 --- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp +++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp @@ -329,7 +329,6 @@ status_t OggReader::FindLastPages() { TRACE("OggReader::FindLastPages\n"); - bigtime_t start_time = system_time(); status_t result = B_ERROR; diff --git a/src/add-ons/media/plugins/ogg/OggSeekable.cpp b/src/add-ons/media/plugins/ogg/OggSeekable.cpp index a43f710c31..cbe5b5e40c 100644 --- a/src/add-ons/media/plugins/ogg/OggSeekable.cpp +++ b/src/add-ons/media/plugins/ogg/OggSeekable.cpp @@ -332,7 +332,7 @@ OggSeekable::Seek(uint32 seekTo, int64 *frame, bigtime_t *time) if (granulepos != fFirstGranulepos) { // binary search to find our place off_t right = GetLastPagePosition(); - uint width = (uint)log10(max_c(1, fFirstGranulepos + right)) + 2; + // uint width = (uint)log10(max_c(1, fFirstGranulepos + right)) + 2; while (true) { ogg_sync_reset(&fSync); ogg_stream_reset(&fStreamState); diff --git a/src/add-ons/print/drivers/pdf/source/AboutText.cpp b/src/add-ons/print/drivers/pdf/source/AboutText.cpp index f9287e5e64..45f8fa1201 100644 --- a/src/add-ons/print/drivers/pdf/source/AboutText.cpp +++ b/src/add-ons/print/drivers/pdf/source/AboutText.cpp @@ -29,6 +29,7 @@ THE SOFTWARE. #include +/* static const char* kAbout = "PDF Writer for BeOS\n" @@ -44,3 +45,4 @@ B_UTF8_COPYRIGHT " 2001-2004 Haiku\n" "\tInteractive Features\n" "\t" B_UTF8_ELLIPSIS ; +*/ diff --git a/src/add-ons/translators/exr/EXRTranslator.cpp b/src/add-ons/translators/exr/EXRTranslator.cpp index 859eeaa2e6..75632de07d 100644 --- a/src/add-ons/translators/exr/EXRTranslator.cpp +++ b/src/add-ons/translators/exr/EXRTranslator.cpp @@ -120,7 +120,7 @@ EXRTranslator::DerivedTranslate(BPositionIO* source, //Imath::Box2i dw = in.dataWindow(); const Imath::Box2i &displayWindow = in.displayWindow(); const Imath::Box2i &dataWindow = in.dataWindow(); - float a = in.pixelAspectRatio(); // TODO take into account the aspect ratio + //float a = in.pixelAspectRatio(); // TODO take into account the aspect ratio int dataWidth = dataWindow.max.x - dataWindow.min.x + 1; int dataHeight = dataWindow.max.y - dataWindow.min.y + 1; int displayWidth = displayWindow.max.x - displayWindow.min.x + 1; diff --git a/src/add-ons/translators/gif/GIFSave.cpp b/src/add-ons/translators/gif/GIFSave.cpp index 85aace7044..b8b6ea38a8 100644 --- a/src/add-ons/translators/gif/GIFSave.cpp +++ b/src/add-ons/translators/gif/GIFSave.cpp @@ -328,7 +328,7 @@ GIFSave::NextPixel(int pixel) { int bpr = bitmap->BytesPerRow(); color_space cs = bitmap->ColorSpace(); - bool useAlphaForTransparency = prefs->usetransparentauto && cs == B_RGBA32 || cs == B_RGBA32_BIG; + bool useAlphaForTransparency = (prefs->usetransparentauto && cs == B_RGBA32) || cs == B_RGBA32_BIG; unsigned char r, g, b, a; if (cs == B_RGB32 || cs == B_RGBA32) { diff --git a/src/add-ons/translators/gif/Prefs.cpp b/src/add-ons/translators/gif/Prefs.cpp index 64315b3e08..da31cda70c 100644 --- a/src/add-ons/translators/gif/Prefs.cpp +++ b/src/add-ons/translators/gif/Prefs.cpp @@ -74,7 +74,7 @@ Prefs::~Prefs() // GetInt bool -Prefs::GetInt(char *name, int *value, int *defaultvalue) +Prefs::GetInt(const char *name, int *value, int *defaultvalue) { status_t err = file->ReadAttr(name, B_INT32_TYPE, 0, value, 4); if (err == B_ENTRY_NOT_FOUND) { @@ -92,7 +92,7 @@ Prefs::GetInt(char *name, int *value, int *defaultvalue) // GetBool bool -Prefs::GetBool(char *name, bool *value, bool *defaultvalue) +Prefs::GetBool(const char *name, bool *value, bool *defaultvalue) { status_t err = file->ReadAttr(name, B_BOOL_TYPE, 0, value, 1); if (err == B_ENTRY_NOT_FOUND) { @@ -110,7 +110,7 @@ Prefs::GetBool(char *name, bool *value, bool *defaultvalue) // PutInt bool -Prefs::PutInt(char *name, int *value) +Prefs::PutInt(const char *name, int *value) { status_t err = file->WriteAttr(name, B_INT32_TYPE, 0, value, 4); if (err < 0) { @@ -122,7 +122,7 @@ Prefs::PutInt(char *name, int *value) // PutBool bool -Prefs::PutBool(char *name, bool *value) +Prefs::PutBool(const char *name, bool *value) { status_t err = file->WriteAttr(name, B_BOOL_TYPE, 0, value, 1); if (err < 0) { diff --git a/src/add-ons/translators/gif/Prefs.h b/src/add-ons/translators/gif/Prefs.h index 123eb11587..d410023b79 100644 --- a/src/add-ons/translators/gif/Prefs.h +++ b/src/add-ons/translators/gif/Prefs.h @@ -30,10 +30,10 @@ class Prefs { int transparentred, transparentgreen, transparentblue, palettemode, palette_size_in_bits; private: - bool GetInt(char *name, int *value, int *defaultvalue); - bool GetBool(char *name, bool *value, bool *defaultvalue); - bool PutInt(char *name, int *value); - bool PutBool(char *name, bool *value); + bool GetInt(const char *name, int *value, int *defaultvalue); + bool GetBool(const char *name, bool *value, bool *defaultvalue); + bool PutInt(const char *name, int *value); + bool PutBool(const char *name, bool *value); BNode *file; }; diff --git a/src/add-ons/translators/ico/ICOTranslator.cpp b/src/add-ons/translators/ico/ICOTranslator.cpp index cc34c85dad..3f03427a72 100644 --- a/src/add-ons/translators/ico/ICOTranslator.cpp +++ b/src/add-ons/translators/ico/ICOTranslator.cpp @@ -159,7 +159,7 @@ ICOTranslator::DerivedTranslate(BPositionIO *source, status_t ICOTranslator::DerivedCanHandleImageSize(float width, float height) const { - if (!ICO::is_valid_size(width) || !ICO::is_valid_size(height)) + if (!ICO::is_valid_size((int)width) || !ICO::is_valid_size((int)height)) return B_NO_TRANSLATOR; return B_OK; } diff --git a/src/add-ons/translators/jpeg/exif_parser.cpp b/src/add-ons/translators/jpeg/exif_parser.cpp index 8def67601c..10370f3d1d 100644 --- a/src/add-ons/translators/jpeg/exif_parser.cpp +++ b/src/add-ons/translators/jpeg/exif_parser.cpp @@ -65,7 +65,7 @@ add_to_message(TReadHelper& source, BMessage& target, tiff_tag& tag, // remove trailing spaces int32 i = tag.length; - while (--i > 0 && isspace(buffer[i]) || !buffer[i]) { + while ((--i > 0 && isspace(buffer[i])) || !buffer[i]) { buffer[i] = '\0'; } diff --git a/src/apps/cdplayer/CDDBSupport.cpp b/src/apps/cdplayer/CDDBSupport.cpp index af239731f3..97e462d417 100644 --- a/src/apps/cdplayer/CDDBSupport.cpp +++ b/src/apps/cdplayer/CDDBSupport.cpp @@ -43,7 +43,7 @@ const int kTerminatingSignal = SIGINT; // SIGCONT; // descriptors, which are each 8 bytes. We don't really need the first 5 bytes // of the track descriptor, so we'll just ignore them. All we really want is the // length of each track, which happen to be the last 3 bytes of the descriptor. -typedef struct TrackRecord { +struct TrackRecord { int8 unused[5]; int8 min; diff --git a/src/apps/cortex/addons/AudioAdapter/AudioAdapterAddOn.cpp b/src/apps/cortex/addons/AudioAdapter/AudioAdapterAddOn.cpp index c4471f1fc4..922f194957 100644 --- a/src/apps/cortex/addons/AudioAdapter/AudioAdapterAddOn.cpp +++ b/src/apps/cortex/addons/AudioAdapter/AudioAdapterAddOn.cpp @@ -58,8 +58,8 @@ status_t AudioAdapterAddOn::GetFlavorAt( flavor_info* pInfo = new flavor_info; pInfo->internal_id = n; - pInfo->name = "AudioAdapter"; - pInfo->info = + pInfo->name = (char *)"AudioAdapter"; + pInfo->info = (char *) "AudioAdapter (generic raw-audio format conversion).\n" "by Eric Moon (8 September 1999)"; pInfo->kinds = B_BUFFER_CONSUMER | B_BUFFER_PRODUCER | B_CONTROLLABLE; diff --git a/src/apps/cortex/addons/Flanger/FlangerAddOn.cpp b/src/apps/cortex/addons/Flanger/FlangerAddOn.cpp index 865166a964..e3f6c41c64 100644 --- a/src/apps/cortex/addons/Flanger/FlangerAddOn.cpp +++ b/src/apps/cortex/addons/Flanger/FlangerAddOn.cpp @@ -45,8 +45,8 @@ status_t FlangerAddOn::GetFlavorAt( flavor_info* pInfo = new flavor_info; pInfo->internal_id = n; - pInfo->name = "Flanger"; - pInfo->info = + pInfo->name = (char *)"Flanger"; + pInfo->info = (char *) "An add-on version of FlangerNode.\n" "by Eric Moon (16 June, 1999)"; pInfo->kinds = B_BUFFER_CONSUMER | B_BUFFER_PRODUCER | B_CONTROLLABLE; diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp index cd71fc94de..6bb683f1d8 100644 --- a/src/apps/deskbar/BeMenu.cpp +++ b/src/apps/deskbar/BeMenu.cpp @@ -242,10 +242,13 @@ TBeMenu::AddStandardBeMenuItems() AddSeparatorItem(); } +#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL static const char* kAboutHaikuMenuItemStr = B_TRANSLATE_MARK( "About Haiku" B_UTF8_ELLIPSIS); +#else static const char* kAboutThisSystemMenuItemStr = B_TRANSLATE_MARK( "About this system" B_UTF8_ELLIPSIS); +#endif item = new BMenuItem( #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL @@ -300,9 +303,9 @@ TBeMenu::AddStandardBeMenuItems() item->SetEnabled(!dragging); shutdownMenu->AddItem(item); +#ifdef APM_SUPPORT static const char* kSuspendMenuItemStr = B_TRANSLATE_MARK("Suspend"); -#ifdef APM_SUPPORT if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) { item = new BMenuItem(B_TRANSLATE(kSuspendMenuItemStr), new BMessage(kSuspendSystem)); diff --git a/src/apps/deskbar/ResourceSet.cpp b/src/apps/deskbar/ResourceSet.cpp index 212d598901..6bbb33babc 100644 --- a/src/apps/deskbar/ResourceSet.cpp +++ b/src/apps/deskbar/ResourceSet.cpp @@ -546,7 +546,7 @@ TResourceSet::ExpandString(BString* out, const char* in) in++; } else - while (isalnum(*in) || *in == '_' && i + while ((isalnum(*in) || *in == '_') && i < sizeof(variableName) - 1) variableName[i++] = *in++; diff --git a/src/apps/deskbar/TeamMenuItem.cpp b/src/apps/deskbar/TeamMenuItem.cpp index c27b36f4ff..cbd669fb32 100644 --- a/src/apps/deskbar/TeamMenuItem.cpp +++ b/src/apps/deskbar/TeamMenuItem.cpp @@ -273,7 +273,7 @@ TTeamMenuItem::Draw() } // if not selected or being tracked on, fill with gray - if (!_IsSelected() && !menu->IsRedrawAfterSticky() || !canHandle + if ((!_IsSelected() && !menu->IsRedrawAfterSticky()) || !canHandle || !IsEnabled()) { frame.InsetBy(1, 1); menu->SetHighColor(menuColor); diff --git a/src/apps/deskbar/WindowMenuItem.cpp b/src/apps/deskbar/WindowMenuItem.cpp index 42802e4172..ddf94f4b27 100644 --- a/src/apps/deskbar/WindowMenuItem.cpp +++ b/src/apps/deskbar/WindowMenuItem.cpp @@ -206,7 +206,7 @@ TWindowMenuItem::Draw() // if not selected or being tracked on, fill with gray TBarView* barview = (static_cast(be_app))->BarView(); - if (!IsSelected() && !menu->IsRedrawAfterSticky() + if ((!IsSelected() && !menu->IsRedrawAfterSticky()) || barview->Dragging() || !IsEnabled()) { rgb_color shadow = tint_color(menuColor, 1.09); @@ -294,8 +294,8 @@ TWindowMenuItem::Invoke(BMessage* /*message*/) if (item->Menu()->Window() != NULL) { zoomRect = item->Menu()->ConvertToScreen(item->Frame()); - doZoom = fMini && action == B_BRING_TO_FRONT - || !fMini && action == B_MINIMIZE_WINDOW; + doZoom = (fMini && action == B_BRING_TO_FRONT) + || (!fMini && action == B_MINIMIZE_WINDOW); } do_window_action(fID, action, zoomRect, doZoom); diff --git a/src/apps/deskcalc/CalcApplication.cpp b/src/apps/deskcalc/CalcApplication.cpp index aca9bfa588..fdd1a810ae 100644 --- a/src/apps/deskcalc/CalcApplication.cpp +++ b/src/apps/deskcalc/CalcApplication.cpp @@ -23,7 +23,7 @@ static const char* kSettingsFileName = "DeskCalc_settings"; -extern const char* kAppSig = "application/x-vnd.Haiku-DeskCalc"; +const char* kAppSig = "application/x-vnd.Haiku-DeskCalc"; static const float kDefaultWindowWidth = 220.0; static const float kDefaultWindowHeight = 140.0; diff --git a/src/apps/icon-o-matic/generic/gui/ListViews.cpp b/src/apps/icon-o-matic/generic/gui/ListViews.cpp index f2f2dccd47..bc009e4f16 100644 --- a/src/apps/icon-o-matic/generic/gui/ListViews.cpp +++ b/src/apps/icon-o-matic/generic/gui/ListViews.cpp @@ -665,7 +665,7 @@ DragSortableListView::ScrollTo(int32 index) if (index >= CountItems()) index = CountItems() - 1; - if (BListItem* item = ItemAt(index)) { + if (ItemAt(index)) { BRect itemFrame = ItemFrame(index); BRect bounds = Bounds(); if (itemFrame.top < bounds.top) { @@ -882,7 +882,7 @@ DragSortableListView::_SetDropIndex(int32 index) int32 count = CountItems(); if (fDropIndex == count) { BRect r; - if (BListItem* item = ItemAt(count - 1)) { + if (ItemAt(count - 1)) { r = ItemFrame(count - 1); r.top = r.bottom; r.bottom = r.top + 1.0; diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp index ceb4941af2..93aae006c5 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp @@ -425,7 +425,7 @@ set_bits(uint8* bits, uint8 r, uint8 g, uint8 b) } // _UpdateThread -int32 +status_t ColorField::_UpdateThread(void* data) { // initializing @@ -589,6 +589,7 @@ ColorField::_UpdateThread(void* data) } } } + return B_OK; } // _DrawBorder diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.h b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.h index 1532f19fd3..4a5db046b3 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.h +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.h @@ -69,7 +69,7 @@ class ColorField : { return fMouseDown; } private: - static int32 _UpdateThread(void* data); + static status_t _UpdateThread(void* data); void _DrawBorder(); selected_color_mode fMode; diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp index 3d40199f8d..652c426e5b 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp @@ -513,7 +513,7 @@ ColorSlider::SetMarkerToColor(rgb_color color) } // _UpdateThread -int32 +status_t ColorSlider::_UpdateThread(void* data) { // initializing @@ -632,6 +632,7 @@ ColorSlider::_UpdateThread(void* data) } } } + return B_OK; } // _DrawColorLineY diff --git a/src/apps/launchbox/IconButton.cpp b/src/apps/launchbox/IconButton.cpp index 85eaf35407..810003f4ab 100644 --- a/src/apps/launchbox/IconButton.cpp +++ b/src/apps/launchbox/IconButton.cpp @@ -554,8 +554,8 @@ IconButton::Bitmap() const bool IconButton::DrawBorder() const { - return (IsEnabled() && (_HasFlags(STATE_INSIDE) - || _HasFlags(STATE_TRACKING)) || _HasFlags(STATE_FORCE_PRESSED)); + return ((IsEnabled() && (_HasFlags(STATE_INSIDE) + || _HasFlags(STATE_TRACKING))) || _HasFlags(STATE_FORCE_PRESSED)); } // DrawNormalBorder diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp index ad3e2ece10..df6dce462b 100644 --- a/src/apps/mail/Content.cpp +++ b/src/apps/mail/Content.cpp @@ -1901,7 +1901,7 @@ TTextView::Open(hyper_text *enclosure) case TYPE_MAILTO: if (be_roster->Launch(B_MAIL_TYPE, 1, &enclosure->name) < B_OK) { - char *argv[] = {"Mail", enclosure->name}; + char *argv[] = {(char *)"Mail", enclosure->name}; be_app->ArgvReceived(2, argv); } break; diff --git a/src/apps/mediaplayer/playlist/ListViews.cpp b/src/apps/mediaplayer/playlist/ListViews.cpp index 7d530d31ac..c5dbbb6e0f 100644 --- a/src/apps/mediaplayer/playlist/ListViews.cpp +++ b/src/apps/mediaplayer/playlist/ListViews.cpp @@ -614,7 +614,7 @@ DragSortableListView::ScrollTo(int32 index) if (index >= CountItems()) index = CountItems() - 1; - if (BListItem* item = ItemAt(index)) { + if (ItemAt(index)) { BRect itemFrame = ItemFrame(index); BRect bounds = Bounds(); if (itemFrame.top < bounds.top) { @@ -791,7 +791,7 @@ DragSortableListView::_SetDropIndex(int32 index) int32 count = CountItems(); if (fDropIndex == count) { BRect r; - if (BListItem* item = ItemAt(count - 1)) { + if (ItemAt(count - 1)) { r = ItemFrame(count - 1); r.top = r.bottom; r.bottom = r.top + 1.0; diff --git a/src/apps/poorman/PoorManServer.cpp b/src/apps/poorman/PoorManServer.cpp index a300564ba8..967661928d 100644 --- a/src/apps/poorman/PoorManServer.cpp +++ b/src/apps/poorman/PoorManServer.cpp @@ -43,8 +43,8 @@ PoorManServer::PoorManServer(const char* webDir, (unsigned short)80,//port (char*)0,//cgi pattern 0,//cgi_limit - "iso-8859-1",//charset - "",//p3p + (char *)"iso-8859-1",//charset + (char *)"",//p3p -1,//max_age const_cast(webDir),//cwd 1,//no_log @@ -232,7 +232,7 @@ int32 PoorManServer::_Listener(void* data) if (s->fCurConns > s->fMaxConns) { httpd_send_err(hc, 503, - httpd_err503title, "", httpd_err503form, ""); + httpd_err503title, (char *)"", httpd_err503form, (char *)""); httpd_write_response(hc); continue; } @@ -292,7 +292,7 @@ int32 PoorManServer::_Worker(void* data) break; case GR_BAD_REQUEST: httpd_send_err(hc, 400, - httpd_err400title, "", httpd_err400form, ""); + httpd_err400title, (char *)"", httpd_err400form, (char *)""); httpd_write_response(hc);//fall through case GR_NO_REQUEST: //fall through default: //won't happen diff --git a/src/apps/processcontroller/IconMenuItem.cpp b/src/apps/processcontroller/IconMenuItem.cpp index 559992cd5c..53abd59a40 100644 --- a/src/apps/processcontroller/IconMenuItem.cpp +++ b/src/apps/processcontroller/IconMenuItem.cpp @@ -169,7 +169,7 @@ before_dano() get_system_info(&sys_info); time_t kernelTime = parsedate(sys_info.kernel_build_date, time(NULL)); struct tm* date = gmtime(&kernelTime); - old_version = (date->tm_year < 101 || date->tm_year == 101 && date->tm_mon < 10); + old_version = (date->tm_year < 101 || (date->tm_year == 101 && date->tm_mon < 10)); } return old_version; diff --git a/src/apps/showimage/Filter.cpp b/src/apps/showimage/Filter.cpp index eac0e09fa2..641b9dafc8 100644 --- a/src/apps/showimage/Filter.cpp +++ b/src/apps/showimage/Filter.cpp @@ -267,7 +267,7 @@ Scaler::~Scaler() BBitmap* Scaler::CreateDestImage(BBitmap* srcImage) { - if (srcImage == NULL || srcImage->ColorSpace() != B_RGB32 && srcImage->ColorSpace() != B_RGBA32) return NULL; + if (srcImage == NULL || (srcImage->ColorSpace() != B_RGB32 && srcImage->ColorSpace() != B_RGBA32)) return NULL; BRect dest(0, 0, fRect.IntegerWidth(), fRect.IntegerHeight()); BBitmap* destImage = new BBitmap(dest, fDither ? B_CMAP8 : srcImage->ColorSpace()); diff --git a/src/apps/soundrecorder/TrackSlider.cpp b/src/apps/soundrecorder/TrackSlider.cpp index e55fad3af2..814205dc89 100644 --- a/src/apps/soundrecorder/TrackSlider.cpp +++ b/src/apps/soundrecorder/TrackSlider.cpp @@ -75,7 +75,7 @@ TrackSlider::_InitBitmap() fBitmap = new BBitmap(rect, BScreen().ColorSpace(), true); - fBitmapView = new SliderOffscreenView(rect.OffsetToSelf(B_ORIGIN), "bitmapView"); + fBitmapView = new SliderOffscreenView(rect.OffsetToSelf(B_ORIGIN), (char *)"bitmapView"); fBitmap->AddChild(fBitmapView); fBitmapView->fRight = Bounds().right - kLeftRightTrackSliderWidth; diff --git a/src/kits/mail/MailAttachment.cpp b/src/kits/mail/MailAttachment.cpp index 4af8dfd9d1..f05f0611eb 100644 --- a/src/kits/mail/MailAttachment.cpp +++ b/src/kits/mail/MailAttachment.cpp @@ -245,7 +245,7 @@ status_t BSimpleMailAttachment::SetDecodedData(const void *data, size_t length) void BSimpleMailAttachment::SetEncoding(mail_encoding encoding) { _encoding = encoding; - char *cte = NULL; //--Content Transfer Encoding + const char *cte = NULL; //--Content Transfer Encoding switch (_encoding) { case base64: cte = "base64"; diff --git a/src/kits/mail/MailChain.cpp b/src/kits/mail/MailChain.cpp index 516b9a9949..cc9cf989f7 100644 --- a/src/kits/mail/MailChain.cpp +++ b/src/kits/mail/MailChain.cpp @@ -95,9 +95,9 @@ BMailChain::Load(BMessage* settings) char* addon_path; if (settings->FindMessage("filter_settings", i, filter) < B_OK - || (settings->FindString("filter_addons", i, (const char**)&addon_path) < B_OK + || ((settings->FindString("filter_addons", i, (const char**)&addon_path) < B_OK || get_ref_for_path(addon_path, ref) < B_OK) - && settings->FindRef("filter_addons", i, ref) < B_OK) { + && settings->FindRef("filter_addons", i, ref) < B_OK)) { delete filter; delete ref; break; diff --git a/src/kits/mail/MailComponent.cpp b/src/kits/mail/MailComponent.cpp index a277f7ee2e..14aea04b77 100644 --- a/src/kits/mail/MailComponent.cpp +++ b/src/kits/mail/MailComponent.cpp @@ -32,8 +32,8 @@ struct CharsetConversionEntry extern const CharsetConversionEntry mail_charsets[]; -extern const char *kHeaderCharsetString = "header-charset"; -extern const char *kHeaderEncodingString = "header-encoding"; +const char *kHeaderCharsetString = "header-charset"; +const char *kHeaderEncodingString = "header-encoding"; // Special field names in the headers which specify the character set (int32) // and encoding (int8) to use when converting the headers from UTF-8 to the // output e-mail format (rfc2047). Since they are numbers, not strings, the diff --git a/src/kits/media/MediaTrack.cpp b/src/kits/media/MediaTrack.cpp index c146a6884c..7ce0c69be1 100644 --- a/src/kits/media/MediaTrack.cpp +++ b/src/kits/media/MediaTrack.cpp @@ -530,7 +530,7 @@ BMediaTrack::ReadChunk(char** _buffer, int32* _size, media_header* _header) // not work so well because of the chunk cache. But providing a // "duration" field in the media_header could be useful. fCurrentTime = fCurrentTime = _header->start_time; - fCurrentFrame = fCurrentTime * _FrameRate() / 1000000LL; + fCurrentFrame = (int64)(fCurrentTime * _FrameRate() / 1000000LL); } diff --git a/src/kits/tracker/TrackerString.cpp b/src/kits/tracker/TrackerString.cpp index 1393fa2f84..2168ebbe82 100644 --- a/src/kits/tracker/TrackerString.cpp +++ b/src/kits/tracker/TrackerString.cpp @@ -449,9 +449,9 @@ TrackerString::MatchesBracketExpression(const char *string, const char *pattern, return false; // Not a valid range! - if (islower(start) && islower(stop) - || isupper(start) && isupper(stop) - || isdigit(start) && isdigit(stop)) + if ((islower(start) && islower(stop)) + || (isupper(start) && isupper(stop)) + || (isdigit(start) && isdigit(stop))) // Make sure 'start' and 'stop' are of the same type. match = start <= testChar && testChar <= stop; else diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp index 36cc0aa6c9..d52dbc4904 100644 --- a/src/servers/mail/DeskbarView.cpp +++ b/src/servers/mail/DeskbarView.cpp @@ -235,7 +235,7 @@ DeskbarView::MessageReceived(BMessage* message) case MD_OPEN_NEW: { - char* argv[] = {"New Message", "mailto:"}; + char* argv[] = {(char *)"New Message", (char *)"mailto:"}; be_roster->Launch("text/x-email", 2, argv); break; }