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

[Miles Bader]

Index: emacs/lib-src/update-game-score.c
diff -c emacs/lib-src/update-game-score.c:1.14 
emacs/lib-src/update-game-score.c:1.15
*** emacs/lib-src/update-game-score.c:1.14      Tue Feb  4 07:03:44 2003
--- emacs/lib-src/update-game-score.c   Tue Feb  4 09:06:56 2003
***************
*** 216,228 ****
    user_id = get_user_id ();
    if (user_id == NULL)
      lose_syserr ("Couldn't determine user id");
!   
    if (stat (scorefile, &buf) < 0)
      lose_syserr ("Failed to access scores file");
!               
    if (lock_file (scorefile, &lockstate) < 0)
      lose_syserr ("Failed to lock scores file");
!                 
    if (read_scores (scorefile, &scores, &scorecount) < 0)
      {
        unlock_file (scorefile, lockstate);
--- 216,228 ----
    user_id = get_user_id ();
    if (user_id == NULL)
      lose_syserr ("Couldn't determine user id");
! 
    if (stat (scorefile, &buf) < 0)
      lose_syserr ("Failed to access scores file");
! 
    if (lock_file (scorefile, &lockstate) < 0)
      lose_syserr ("Failed to lock scores file");
! 
    if (read_scores (scorefile, &scores, &scorecount) < 0)
      {
        unlock_file (scorefile, lockstate);
***************
*** 283,289 ****
      char *username = malloc (unamelen);
      if (!username)
        return -1;
!     
      while ((c = getc (f)) != EOF
           && !isspace (c))
        {
--- 283,289 ----
      char *username = malloc (unamelen);
      if (!username)
        return -1;
! 
      while ((c = getc (f)) != EOF
           && !isspace (c))
        {
***************
*** 293,299 ****
        username[unameread] = c;
        unameread++;
        }
!     if (c == EOF)    
        return -1;
      username[unameread] = '\0';
      score->username = username;
--- 293,299 ----
        username[unameread] = c;
        unameread++;
        }
!     if (c == EOF)
        return -1;
      username[unameread] = '\0';
      score->username = username;
***************
*** 342,353 ****
    int readval, scorecount, cursize;
    struct score_entry *ret;
    FILE *f = fopen (filename, "r");
!   if (!f) 
      return -1;
    scorecount = 0;
    cursize = 16;
    ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize);
!   if (!ret) 
      return -1;
    while ((readval = read_score (f, &ret[scorecount])) == 0)
      {
--- 342,353 ----
    int readval, scorecount, cursize;
    struct score_entry *ret;
    FILE *f = fopen (filename, "r");
!   if (!f)
      return -1;
    scorecount = 0;
    cursize = 16;
    ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize);
!   if (!ret)
      return -1;
    while ((readval = read_score (f, &ret[scorecount])) == 0)
      {
***************
*** 388,394 ****
  }
  
  int
! push_score (scores, count, newscore, username, newdata) 
       struct score_entry **scores;
       int *count; int newscore;
       char *username;
--- 388,394 ----
  }
  
  int
! push_score (scores, count, newscore, username, newdata)
       struct score_entry **scores;
       int *count; int newscore;
       char *username;
***************
*** 406,417 ****
    *scores = newscores;
    return 0;
  }
!   
  void
  sort_scores (scores, count, reverse)
       struct score_entry *scores;
       int count;
!      int reverse; 
  {
    qsort (scores, count, sizeof (struct score_entry),
        reverse ? score_compare_reverse : score_compare);
--- 406,417 ----
    *scores = newscores;
    return 0;
  }
! 
  void
  sort_scores (scores, count, reverse)
       struct score_entry *scores;
       int count;
!      int reverse;
  {
    qsort (scores, count, sizeof (struct score_entry),
        reverse ? score_compare_reverse : score_compare);
***************
*** 421,429 ****
  write_scores (filename, scores, count)
       const char *filename;
       const struct score_entry * scores;
!      int count; 
  {
!   FILE *f;  
    int i;
    char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1);
    if (!tempfile)
--- 421,429 ----
  write_scores (filename, scores, count)
       const char *filename;
       const struct score_entry * scores;
!      int count;
  {
!   FILE *f;
    int i;
    char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1);
    if (!tempfile)
***************
*** 448,454 ****
      return -1;
    return 0;
  }
!   
  int
  lock_file (filename, state)
    const char *filename;
--- 448,454 ----
      return -1;
    return 0;
  }
! 
  int
  lock_file (filename, state)
    const char *filename;
***************
*** 491,497 ****
    close (fd);
    return 0;
  }
!  
  int
  unlock_file (filename, state)
    const char *filename;
--- 491,497 ----
    close (fd);
    return 0;
  }
! 
  int
  unlock_file (filename, state)
    const char *filename;