[haiku-commits] r37670 - in haiku/trunk: build/jam headers/os/drivers headers/private/graphics/matrox headers/private/graphics/neomagic src/add-ons/accelerants/ati ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 21 Jul 2010 23:43:21 +0200 (CEST)
Author: zooey
Date: 2010-07-21 23:43:20 +0200 (Wed, 21 Jul 2010)
New Revision: 37670
Changeset: http://dev.haiku-os.org/changeset/37670
Ticket: http://dev.haiku-os.org/ticket/6349
Modified:
haiku/trunk/build/jam/BuildSetup
haiku/trunk/headers/os/drivers/config_manager.h
haiku/trunk/headers/private/graphics/matrox/DriverInterface.h
haiku/trunk/headers/private/graphics/neomagic/DriverInterface.h
haiku/trunk/src/add-ons/accelerants/ati/rage128_dpms.cpp
haiku/trunk/src/add-ons/accelerants/ati/rage128_init.cpp
haiku/trunk/src/add-ons/accelerants/ati/rage128_mode.cpp
haiku/trunk/src/add-ons/accelerants/neomagic/acc_std.h
haiku/trunk/src/add-ons/accelerants/nvidia/acc_std.h
haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_std.h
haiku/trunk/src/add-ons/accelerants/s3/savage_init.cpp
haiku/trunk/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
haiku/trunk/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
haiku/trunk/src/add-ons/input_server/methods/canna/canna/RK.h
haiku/trunk/src/add-ons/input_server/methods/canna/lib/canna.h
haiku/trunk/src/add-ons/input_server/methods/canna/rk/RKintern.h
haiku/trunk/src/add-ons/kernel/bus_managers/firewire/firewire.c
haiku/trunk/src/add-ons/kernel/bus_managers/firewire/util.c
haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
haiku/trunk/src/add-ons/kernel/bus_managers/scsi/devices.c
haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h
haiku/trunk/src/add-ons/kernel/drivers/dvb/cx23882/util.c
haiku/trunk/src/add-ons/kernel/drivers/graphics/common/log_dump.h
haiku/trunk/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c
haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
haiku/trunk/src/add-ons/kernel/drivers/tty/driver.cpp
haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c
haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Debug.h
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
haiku/trunk/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp
haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp
haiku/trunk/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
haiku/trunk/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp
haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
haiku/trunk/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp
haiku/trunk/src/add-ons/media/plugins/asf_reader/asf_reader.cpp
haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp
haiku/trunk/src/add-ons/print/drivers/pdf/source/AboutText.cpp
haiku/trunk/src/add-ons/translators/exr/EXRTranslator.cpp
haiku/trunk/src/add-ons/translators/gif/GIFSave.cpp
haiku/trunk/src/add-ons/translators/gif/Prefs.cpp
haiku/trunk/src/add-ons/translators/gif/Prefs.h
haiku/trunk/src/add-ons/translators/ico/ICOTranslator.cpp
haiku/trunk/src/add-ons/translators/jpeg/exif_parser.cpp
haiku/trunk/src/apps/cdplayer/CDDBSupport.cpp
haiku/trunk/src/apps/cortex/addons/AudioAdapter/AudioAdapterAddOn.cpp
haiku/trunk/src/apps/cortex/addons/Flanger/FlangerAddOn.cpp
haiku/trunk/src/apps/deskbar/BeMenu.cpp
haiku/trunk/src/apps/deskbar/ResourceSet.cpp
haiku/trunk/src/apps/deskbar/TeamMenuItem.cpp
haiku/trunk/src/apps/deskbar/WindowMenuItem.cpp
haiku/trunk/src/apps/deskcalc/CalcApplication.cpp
haiku/trunk/src/apps/icon-o-matic/generic/gui/ListViews.cpp
haiku/trunk/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp
haiku/trunk/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.h
haiku/trunk/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp
haiku/trunk/src/apps/launchbox/IconButton.cpp
haiku/trunk/src/apps/mail/Content.cpp
haiku/trunk/src/apps/mediaplayer/playlist/ListViews.cpp
haiku/trunk/src/apps/poorman/PoorManServer.cpp
haiku/trunk/src/apps/processcontroller/IconMenuItem.cpp
haiku/trunk/src/apps/showimage/Filter.cpp
haiku/trunk/src/apps/soundrecorder/TrackSlider.cpp
haiku/trunk/src/kits/mail/MailAttachment.cpp
haiku/trunk/src/kits/mail/MailChain.cpp
haiku/trunk/src/kits/mail/MailComponent.cpp
haiku/trunk/src/kits/media/MediaTrack.cpp
haiku/trunk/src/kits/tracker/TrackerString.cpp
haiku/trunk/src/servers/mail/DeskbarView.cpp
Log:
* applied patch by kaliber that fixes more than 100 warnings - thanks a lot!
Closes #6349
Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup 2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/build/jam/BuildSetup 2010-07-21 21:43:20 UTC (rev 37670)
@@ -1170,25 +1170,221 @@
}
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 ;
}
Modified: haiku/trunk/headers/os/drivers/config_manager.h
===================================================================
--- haiku/trunk/headers/os/drivers/config_manager.h 2010-07-21 20:11:48 UTC
(rev 37669)
+++ haiku/trunk/headers/os/drivers/config_manager.h 2010-07-21 21:43:20 UTC
(rev 37670)
@@ -106,6 +106,8 @@
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
Modified: haiku/trunk/headers/private/graphics/matrox/DriverInterface.h
===================================================================
--- haiku/trunk/headers/private/graphics/matrox/DriverInterface.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/headers/private/graphics/matrox/DriverInterface.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -187,7 +187,7 @@
G400MAX,
G450,
G550
- };
+ } card_type;
struct
{
/* specialised registers for card initialisation read from MGA
BIOS (pins) */
Modified: haiku/trunk/headers/private/graphics/neomagic/DriverInterface.h
===================================================================
--- haiku/trunk/headers/private/graphics/neomagic/DriverInterface.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/headers/private/graphics/neomagic/DriverInterface.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -179,7 +179,7 @@
NM2230,
NM2360,
NM2380
- };
+ } card_type;
struct
{
/* specialised registers for predefined cardspecs */
Modified: haiku/trunk/src/add-ons/accelerants/ati/rage128_dpms.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/ati/rage128_dpms.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/ati/rage128_dpms.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -72,13 +72,13 @@
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:
Modified: haiku/trunk/src/add-ons/accelerants/ati/rage128_init.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/ati/rage128_init.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/ati/rage128_init.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -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" },
};
Modified: haiku/trunk/src/add-ons/accelerants/ati/rage128_mode.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/ati/rage128_mode.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/ati/rage128_mode.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -304,7 +304,7 @@
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 @@
// 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 @@
// 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--) {
Modified: haiku/trunk/src/add-ons/accelerants/neomagic/acc_std.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/neomagic/acc_std.h 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/neomagic/acc_std.h 2010-07-21
21:43:20 UTC (rev 37670)
@@ -7,6 +7,7 @@
#define GLOBALDATA_H
#include <stdio.h>
+#include <string.h>
#include <sys/ioctl.h>
#include "DriverInterface.h"
#include "nm_globals.h"
Modified: haiku/trunk/src/add-ons/accelerants/nvidia/acc_std.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/acc_std.h 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/acc_std.h 2010-07-21
21:43:20 UTC (rev 37670)
@@ -7,6 +7,7 @@
#define GLOBALDATA_H
#include <stdio.h>
+#include <string.h>
#include <sys/ioctl.h>
/* DDC/EDID library */
Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_std.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_std.h 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_std.h 2010-07-21
21:43:20 UTC (rev 37670)
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <string.h>
#include <sys/ioctl.h>
#include <math.h>
#include <OS.h>
Modified: haiku/trunk/src/add-ons/accelerants/s3/savage_init.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/s3/savage_init.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/accelerants/s3/savage_init.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -122,7 +122,7 @@
if (panelX == 1408)
panelX = 1400;
- char* sTechnology;
+ const char* sTechnology;
if ((ReadSeqReg(0x39) & 0x03) == 0)
sTechnology = "TFT";
Modified:
haiku/trunk/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -70,7 +70,7 @@
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);
Modified:
haiku/trunk/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
===================================================================
---
haiku/trunk/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -589,10 +589,10 @@
}
// 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 {
Modified: haiku/trunk/src/add-ons/input_server/methods/canna/canna/RK.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/canna/RK.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/canna/RK.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -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
Modified: haiku/trunk/src/add-ons/input_server/methods/canna/lib/canna.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/lib/canna.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/lib/canna.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -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 */
/************************************************************************/
Modified: haiku/trunk/src/add-ons/input_server/methods/canna/rk/RKintern.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/rk/RKintern.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/rk/RKintern.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -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
Modified: haiku/trunk/src/add-ons/kernel/bus_managers/firewire/firewire.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/firewire/firewire.c
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/firewire/firewire.c
2010-07-21 21:43:20 UTC (rev 37670)
@@ -1096,7 +1096,6 @@
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);
Modified: haiku/trunk/src/add-ons/kernel/bus_managers/firewire/util.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/firewire/util.c 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/firewire/util.c 2010-07-21
21:43:20 UTC (rev 37670)
@@ -65,7 +65,7 @@
*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;
}
Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -34,7 +34,7 @@
LED_SCROLL = 1,
LED_NUM = 2,
LED_CAPS = 4
-} leds_status;
+};
enum {
EXTENDED_KEY = 0xe0,
Modified: haiku/trunk/src/add-ons/kernel/bus_managers/scsi/devices.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/scsi/devices.c 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/scsi/devices.c 2010-07-21
21:43:20 UTC (rev 37670)
@@ -204,7 +204,7 @@
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;
Modified:
haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/CEchoGalsMTC.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -75,6 +75,6 @@
}; // class CEchoGalsMTC
-#endif _CECHOGALSMTC_H_
+#endif // _CECHOGALSMTC_H_
// *** CEchoGalsMTC.H ***
Modified: haiku/trunk/src/add-ons/kernel/drivers/dvb/cx23882/util.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/dvb/cx23882/util.c 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/dvb/cx23882/util.c 2010-07-21
21:43:20 UTC (rev 37670)
@@ -98,6 +98,6 @@
*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;
}
Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/common/log_dump.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/common/log_dump.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/common/log_dump.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -13,5 +13,6 @@
#include <SupportDefs.h>
void log_printall( FILE *logfile, char *buffer, uint32 buffer_len );
+void log_printentry( FILE *logfile, log_entry *entry );
#endif
Modified: haiku/trunk/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c
2010-07-21 21:43:20 UTC (rev 37670)
@@ -426,7 +426,7 @@
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;
Modified: haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -237,7 +237,7 @@
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;
}
Modified: haiku/trunk/src/add-ons/kernel/drivers/tty/driver.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/tty/driver.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/drivers/tty/driver.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -97,8 +97,8 @@
}
}
- gDeviceNames[2 * kNumTTYs] = "ptmx";
- gDeviceNames[2 * kNumTTYs + 1] = "tty";
+ gDeviceNames[2 * kNumTTYs] = (char *)"ptmx";
+ gDeviceNames[2 * kNumTTYs + 1] = (char *)"tty";
tty_add_debugger_commands();
Modified: haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c
2010-07-21 21:43:20 UTC (rev 37670)
@@ -625,8 +625,6 @@
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)
Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -1566,9 +1566,9 @@
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;
Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Debug.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Debug.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Debug.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -212,7 +212,6 @@
#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;
Modified:
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
===================================================================
---
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -132,7 +132,7 @@
{
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);
Modified:
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
===================================================================
---
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -209,7 +209,7 @@
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 @@
// 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,
Modified: haiku/trunk/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -1099,6 +1099,7 @@
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 @@
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;
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireCard.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -75,7 +75,7 @@
{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
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVAddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -171,7 +171,7 @@
// 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;
Modified: haiku/trunk/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -34,8 +34,8 @@
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
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -174,7 +174,7 @@
status_t
-MultiAudioAddOn::_RecursiveScan(char* rootPath, BEntry* rootEntry, uint32
depth)
+MultiAudioAddOn::_RecursiveScan(const char* rootPath, BEntry* rootEntry,
uint32 depth)
{
CALLED();
if (depth > 16)
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h
2010-07-21 21:43:20 UTC (rev 37670)
@@ -30,7 +30,7 @@
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();
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -64,7 +64,7 @@
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)
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp
===================================================================
---
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundDeviceMixer.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -63,7 +63,6 @@
status_t OpenSoundDeviceMixer::GetExtInfo(int index, oss_mixext *info)
{
- status_t err;
CALLED();
if (!info)
@@ -84,7 +83,6 @@
status_t OpenSoundDeviceMixer::GetMixerValue(oss_mixer_value *value)
{
- status_t err;
CALLED();
if (!value)
@@ -105,7 +103,6 @@
status_t OpenSoundDeviceMixer::SetMixerValue(oss_mixer_value *value)
{
- status_t err;
CALLED();
if (!value)
@@ -126,7 +123,6 @@
status_t OpenSoundDeviceMixer::GetEnumInfo(int index, oss_mixer_enuminfo *info)
{
- status_t err;
CALLED();
if (!info)
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -485,9 +485,9 @@
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 @@
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 @@
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;
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp
===================================================================
---
haiku/trunk/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducerAddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -44,8 +44,8 @@
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)";
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
===================================================================
---
haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++
haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -58,9 +58,6 @@
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 @@
QuickCamDevice::StopTransfer()
{
status_t err;
- uint8 r;
DumpRegs();
err = CamDevice::StopTransfer();
@@ -137,7 +133,6 @@
status_t
QuickCamDevice::WaitReadyIIC()
{
- status_t err;
#warning WRITEME
return EBUSY;
}
@@ -146,7 +141,6 @@
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 @@
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 @@
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;
Modified:
haiku/trunk/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/media-add-ons/video_producer_demo/AddOn.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -15,8 +15,8 @@
: 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;
Modified: haiku/trunk/src/add-ons/media/plugins/asf_reader/asf_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/asf_reader/asf_reader.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/plugins/asf_reader/asf_reader.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -294,7 +294,7 @@
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);
Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
2010-07-21 20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
2010-07-21 21:43:20 UTC (rev 37670)
@@ -329,7 +329,6 @@
OggReader::FindLastPages()
{
TRACE("OggReader::FindLastPages\n");
- bigtime_t start_time = system_time();
status_t result = B_ERROR;
Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp 2010-07-21
20:11:48 UTC (rev 37669)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp 2010-07-21
21:43:20 UTC (rev 37670)
@@ -332,7 +332,7 @@
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) {
[... truncated: 584 lines follow ...]
Other related posts: