cex: style: prefer res for returned value

* src/lssi.c, src/parse-simulation.c: here.

src/lssi.c

@@ -41,12 +41,12 @@ typedef struct lssi
 lssi *
 new_lssi (state_item_number si, lssi *p, bitset l, bool free_l)
 {
-  lssi *ret = xmalloc (sizeof (lssi));
+  lssi *res = xmalloc (sizeof *res);
-  ret->si = si;
+  res->si = si;
-  ret->parent = p;
+  res->parent = p;
-  ret->lookahead = l;
+  res->lookahead = l;
-  ret->free_lookahead = free_l;
+  res->free_lookahead = free_l;
-  return ret;
+  return res;
 }
 
 void
@@ -240,10 +240,10 @@ shortest_path_from_start (state_item_number target, symbol_number next_sym)
       fputs ("Cannot find shortest path to conflict state.", stderr);
       exit (1);
     }
-  gl_list_t ret =
+  gl_list_t res =
     gl_list_create_empty (GL_LINKED_LIST, NULL, NULL, NULL, true);
   for (lssi *sn = n; sn != NULL; sn = sn->parent)
-    gl_list_add_first (ret, state_items + sn->si);
+    gl_list_add_first (res, state_items + sn->si);
 
   hash_free (visited);
   gl_list_free (queue);
@@ -251,12 +251,12 @@ shortest_path_from_start (state_item_number target, symbol_number next_sym)
   if (trace_flag & trace_cex)
     {
       puts ("REDUCE ITEM PATH:");
-      gl_list_iterator_t it = gl_list_iterator (ret);
+      gl_list_iterator_t it = gl_list_iterator (res);
       const void *sip;
       while (gl_list_iterator_next (&it, &sip, NULL))
         print_state_item ((state_item *) sip, stdout);
     }
-  return ret;
+  return res;
 }
 
 /**

src/parse-simulation.c

@@ -86,40 +86,40 @@ static int frees = 0;
 static parse_state *
 empty_parse_state (void)
 {
-  parse_state *ret = xcalloc (1, sizeof (parse_state));
+  parse_state *res = xcalloc (1, sizeof (parse_state));
-  ret->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+  res->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
                                                     NULL, NULL, true);
-  ret->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+  res->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
                                                NULL, NULL, true);
   ++allocs;
-  return ret;
+  return res;
 }
 
 parse_state *
 new_parse_state (const state_item *si)
 {
-  parse_state *ret = empty_parse_state ();
+  parse_state *res = empty_parse_state ();
-  ps_chunk_append (&ret->state_items, si);
+  ps_chunk_append (&res->state_items, si);
-  ps_chunk_append (&ret->derivs, derivation_dot ());
+  ps_chunk_append (&res->derivs, derivation_dot ());
-  return ret;
+  return res;
 }
 
 static parse_state *
 copy_parse_state (bool prepend, parse_state *parent)
 {
-  parse_state *ret = xmalloc (sizeof (parse_state));
+  parse_state *res = xmalloc (sizeof *res);
-  memcpy (ret, parent, sizeof (parse_state));
+  memcpy (res, parent, sizeof *res);
-  ret->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+  res->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
                                                     NULL, NULL, true);
-  ret->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+  res->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
                                                NULL, NULL, true);
-  ret->parent = parent;
+  res->parent = parent;
-  ret->prepend = prepend;
+  res->prepend = prepend;
-  ret->reference_count = 0;
+  res->reference_count = 0;
-  ret->free_contents_early = false;
+  res->free_contents_early = false;
   parse_state_retain (parent);
   ++allocs;
-  return ret;
+  return res;
 }
 
 bool

src/symtab.c

@@ -1189,10 +1189,10 @@ init_prec_nodes (void)
 static symgraphlink *
 symgraphlink_new (graphid id, symgraphlink *next)
 {
-  symgraphlink *l = xmalloc (sizeof *l);
+  symgraphlink *res = xmalloc (sizeof *res);
-  l->id = id;
+  res->id = id;
-  l->next = next;
+  res->next = next;
-  return l;
+  return res;
 }