[Emacs-diffs] emacs/lib-src ChangeLog update-game-score.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/11 19:11:08

Modified files:
        lib-src        : ChangeLog update-game-score.c 

Log message:
        (main): Sort scores before trimming them,
        reported by Jason Feng <address@hidden> (bug#4397).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/ChangeLog?cvsroot=emacs&r1=2.541&r2=2.542
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/update-game-score.c?cvsroot=emacs&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.541
retrieving revision 2.542
diff -u -b -r2.541 -r2.542
--- ChangeLog   9 Sep 2009 02:32:25 -0000       2.541
+++ ChangeLog   11 Sep 2009 19:11:07 -0000      2.542
@@ -1,3 +1,8 @@
+2009-09-11  Stefan Monnier  <address@hidden>
+
+       * update-game-score.c (main): Sort scores before trimming them,
+       reported by Jason Feng <address@hidden> (bug#4397).
+
 2009-09-09  Glenn Morris  <address@hidden>
 
        * Makefile.in ($(DESTDIR)${archlibdir}): Set umask to world-readable

Index: update-game-score.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/update-game-score.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- update-game-score.c 8 Jan 2009 03:38:53 -0000       1.27
+++ update-game-score.c 11 Sep 2009 19:11:07 -0000      1.28
@@ -254,6 +254,7 @@
       lose_syserr ("Failed to read scores file");
     }
   push_score (&scores, &scorecount, newscore, user_id, newdata);
+  sort_scores (scores, scorecount, reverse);
   /* Limit the number of scores.  If we're using reverse sorting, then
      we should increment the beginning of the array, to skip over the
      *smallest* scores.  Otherwise, we just decrement the number of
@@ -262,7 +263,6 @@
     scorecount -= (scorecount - MAX_SCORES);
     if (reverse)
       scores += (scorecount - MAX_SCORES);
-  sort_scores (scores, scorecount, reverse);
   if (write_scores (scorefile, scores, scorecount) < 0)
     {
       unlock_file (scorefile, lockstate);