[haiku-commits] Re: r37670 - in haiku/trunk: build/jam headers/os/drivers headers/private/graphics/matrox headers/private/graphics/neomagic src/add-ons/accelerants/ati ...
- From: "Axel Dörfler" <axeld@xxxxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 22 Jul 2010 09:36:23 +0200
zooey@xxxxxxxxxxxxxxx wrote:
> Log:
> * applied patch by kaliber that fixes more than 100 warnings - thanks
> a lot!
> Closes #6349
There are lots of questionable fixes, though. Smaller patches would
have been appreciated, too. Anyway, thanks for the work!
> +++ 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);
Must not be in here, and cannot be used by users of that module anyway.
> OUTREGM(R128_CRTC_EXT_CNTL,
> - R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS,
> mask);
> + (R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS),
> mask);
As François already pointed out, the macro should be fixed instead.
> +++ 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" },
The structure should be made const char* instead.
> +++ 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",
Changing the member to const char* should be binary compatible.
> +++ 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;
I looked it up specifically, and splfw() doesn't have any function
anymore.
> +++ 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 );
This one doesn't belong here. It's not a function that could or should
be called from the outside (log_entry is not even known outside the
source file).
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:";
Why not make it const?
> +++ 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;
I can't think of a reason why this should be moved upwards that much.
> +++ 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"};
Rather make it const.
> // 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.";
Same as above, making it const char* should not impose a binary
compatibility problem.
> +++ 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)
This had been nicely fixed in the other MultiAudioAddOn.h file, why
this brute force change here?
> [... truncated: 584 lines follow ...]
Those only have minor issues :-)
Bye,
Axel.
Other related posts:
