Changeset 489

Timestamp:

08/11/07 00:30:46 (1 year ago)

Author:

ctate

Message:

* Guard types.h against multiple inclusion

* Widespread cleanup of compile warnings, with the goal of making it more likely that any occurrence of those warnings indicates a bona fide bug:

- Because MSVC is slightly stupid sometimes, change

if (!(var = some_func()))

to

if ((var = some_func()) == 0)

to suppress the warning about a possible unintended assignment in a conditional

- Initialize a number of variables that trigger a "var possibly used uninitialized" warning in MSVC

- Remove unused local variables

Files:

• trunk/src/init1.c (modified) (10 diffs)
• trunk/src/monster2.c (modified) (2 diffs)
• trunk/src/randart.c (modified) (1 diff)
• trunk/src/randname.c (modified) (1 diff)
• trunk/src/save.c (modified) (1 diff)
• trunk/src/store.c (modified) (1 diff)
• trunk/src/types.h (modified) (2 diffs)
• trunk/src/ui.c (modified) (1 diff)
• trunk/src/util.c (modified) (1 diff)
• trunk/src/win/readdib.c (modified) (1 diff)

trunk/src/init1.c

@@ -927 +927 @@
-
-                /* Store the name */
-!(v_ptr->name = add_name(head, s))
+(v_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-        }
@@ -1026 +1026 @@
-
-                /* Store the name */
-!(f_ptr->name = add_name(head, s))
+(f_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -1209 +1209 @@
-
-                /* Store the name */
-!(k_ptr->name = add_name(head, s))
+(k_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -1540 +1540 @@
-
-                /* Store the name */
-!(a_ptr->name = add_name(head, s))
+(a_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -1773 +1773 @@
-
-                /* Store the name */
-!(e_ptr->name = add_name(head, s))
+(e_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -2001 +2001 @@
-
-                /* Store the name */
-!(r_ptr->name = add_name(head, s))
+(r_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -2315 +2315 @@
-
-                /* Store the name */
-!(pr_ptr->name = add_name(head, s))
+(pr_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-        }
@@ -2564 +2564 @@
-
-                /* Store the name */
-!(pc_ptr->name = add_name(head, s))
+(pc_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
@@ -2948 +2948 @@
-
-                /* Store the name */
-!(ot_ptr->owner_name = add_name(head, t))
+(ot_ptr->owner_name = add_name(head, t)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-        }
@@ -3209 +3209 @@
-
-                /* Store the name */
-!(s_ptr->name = add_name(head, s))
+(s_ptr->name = add_name(head, s)) == 0
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-        }

trunk/src/monster2.c

@@ -1978 +1978 @@
-        int px = p_ptr->px;
-
-, x
+ = 0, x = 0
-        int     attempts_left = 10000;
-
@@ -2166 +2166 @@
-bool summon_specific(int y1, int x1, int lev, int type)
-{
-, y
+ = 0, y = 0
-
-

trunk/src/randart.c

@@ -1156 +1156 @@
-        s32b power;
-        int tries;
-
+ = 0
-        bool curse_me = FALSE;
-        bool aggravate_me = FALSE;

trunk/src/randname.c

@@ -282 +282 @@
-size_t randname_make(randname_type name_type, size_t min, size_t max, char *word_buf, size_t buflen)
-{
-
+ = 0
-        bool found_word = FALSE;
-

trunk/src/save.c

@@ -1058 +1058 @@
-        if (save_player_aux(new_savefile))
-        {
-                int error;
-
-                safe_setuid_grab();
-

trunk/src/store.c

@@ -2652 +2652 @@
-
-        menu_type menu;
-
+ = EVENT_EMPTY
-        int cursor = 0;
-

trunk/src/types.h

@@ -37 +37 @@
- */
-
+#ifndef INCLUDED_TYPES_H
+#define INCLUDED_TYPES_H
-
-
@@ -1138 +1140 @@
-} grid_data;
-
+
+#endif /* !INCLUDED_TYPES_H */

trunk/src/ui.c

@@ -116 +116 @@
-event_type run_event_loop(event_target * target, bool forever, const event_type *start)
-{
-
+ = EVENT_EMPTY
-        bool handled = TRUE;
-

trunk/src/util.c

@@ -306 +306 @@
-                        {
-                                size_t j;
-
+ != 0
-                                {
-                                        j = tmp - macro_modifier_chr;

trunk/src/win/readdib.c

@@ -228 +228 @@
-        }
-
-!(nNumColors = (WORD)lpbi->biClrUsed)
+(nNumColors = (WORD)lpbi->biClrUsed) == 0
-        {
-                /* no color table for 24-bit, default size otherwise */