More doxygen tidy-up

[disorder] / server / server-queue.c

diff --git a/server/server-queue.c b/server/server-queue.c
index 38af0556f5239f48a478ed72e39e499cc1a4b22f..88e772332513b12240193a1e643578ac4d972dc0 100644 (file)
--- a/server/server-queue.c
+++ b/server/server-queue.c
@@ -65,7 +65,7 @@ static void queue_do_read(struct queue_entry *head, const char *path) {
   char *buffer;
   FILE *fp;
   struct queue_entry *q;
-  int version = 0;
+  int ver = 0;
 
   if(!(fp = fopen(path, "r"))) {
     if(errno == ENOENT)
@@ -76,17 +76,28 @@ static void queue_do_read(struct queue_entry *head, const char *path) {
   while(!inputline(path, fp, &buffer, '\n')) {
     if(buffer[0] == '#') {
       /* Version indicator */
-      version = atoi(buffer + 1);
+      ver = atoi(buffer + 1);
       continue;
     }
     q = xmalloc(sizeof *q);
     queue_unmarshall(q, buffer, queue_read_error, (void *)path);
-    if(version < 1) {
+    if(ver < 1) {
       /* Fix up origin field as best we can; will be wrong in some cases but
        * hopefully not too horribly so. */
       q->origin = q->submitter ? origin_picked : origin_random;
-      if(q->state == playing_isscratch)
+      /* Eliminated obsolete states, since they are assumed elsewhere not to be
+       * set. */
+      switch(q->state) {
+      case playing_isscratch:
         q->origin = origin_scratch;
+        q->state = playing_unplayed;
+        break;
+      case playing_random:
+        q->state = playing_unplayed;
+        break;
+      default:
+        break;
+      }
     }
     if(head == &qhead
        && (!q->track