Changeset 1060

Timestamp:

08/05/07 01:53:46 (1 year ago)

Author:

shawnw

Message:

Merge db save failure fixes from devel into trunk

Files:

• 1.8.3/trunk/CHANGES.182 (modified) (1 diff)
• 1.8.3/trunk/src/game.c (modified) (8 diffs)

1.8.3/trunk/CHANGES.182

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.8.2 patchlevel 7                       ????  ??, 2007
+
+Fixes:
+  * Clarified the behavior of eval() and get_eval() in help.
+    Suggested by Talvo and Javelin.
+  * A failed db save no longer broadcasts a success message
+    in addition to a failure one. Reported by Cooee.
+  * The open database file wasn't getting closed on a failed
+    save.
-
-Version 1.8.2 patchlevel 6                       July 9, 2007

1.8.3/trunk/src/game.c

@@ -95 +95 @@
-extern const unsigned char *tables;
-extern void conf_default_set(void);
-int
+bool
-static FILE *db_open(const char *filename);
-static FILE *db_open_write(const char *filename);
@@ -310 +310 @@
-jmp_buf db_err;
-
-int
+bool
-dump_database_internal(void)
-{
@@ -330 +330 @@
-    flag_broadcast("WIZARD ROYALTY", 0,
-                   T("GAME: ERROR! Database save failed!"));
+    if (f)
+      db_close(f);
-#ifndef PROFILING
-#ifdef HAS_ITIMER
@@ -335 +337 @@
-#endif
-#endif
-1
+false
-  } else {
-    local_dump_database();
@@ -413 +415 @@
-#endif
-
-0
+true
-}
-
@@ -512 +514 @@
-
-  do_rawlog(LT_ERR, "DUMPING: %s.#%d#", globals.dumpfile, epoch);
-dump_database_internal();
-
+if (dump_database_internal())
+  
-}
-
@@ -529 +531 @@
-{
-  pid_t child;
-int
+bool
-  epoch++;
-
@@ -606 +608 @@
-    } else {
-      reserve_fd();
-
+status && 
-        flag_broadcast(0, 0, "%s", DUMP_NOFORK_COMPLETE);
-    }