GNOME.org
 

[beast: 3/43] SFI: use only assert_return and assert_return_unreached instead of assert

commit a29dcc39d1e2b6dee1ccb352cc5e2e2617c5a0af
Author: Tim Janik <timj gnu org>
Date:   Sat Jun 24 02:34:58 2017 +0200

    SFI: use only assert_return and assert_return_unreached instead of assert
    
    Signed-off-by: Tim Janik <timj gnu org>

 sfi/sfidl-cbase.cc     |   20 ++++++++++----------
 sfi/sfidl-corec.cc     |    2 +-
 sfi/sfidl-corecxx.cc   |    8 ++++----
 sfi/sfidl-factory.cc   |    2 +-
 sfi/sfidl-generator.cc |    4 ++--
 sfi/sfidl-namespace.cc |    2 +-
 sfi/sfidl-parser.cc    |    8 ++++----
 sfi/sfifilecrawler.cc  |    6 +++---
 sfi/sfiglue.cc         |    4 ++--
 sfi/sfigluecodec.cc    |    2 +-
 sfi/sfiparams.cc       |    2 +-
 sfi/sfiring.cc         |    2 +-
 sfi/sfistore.cc        |    2 +-
 sfi/sfitime.cc         |    2 +-
 sfi/sfivalues.cc       |    2 +-
 sfi/sfivmarshal.cc     |    4 ++--
 16 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/sfi/sfidl-cbase.cc b/sfi/sfidl-cbase.cc
index baef540..22a23c4 100644
--- a/sfi/sfidl-cbase.cc
+++ b/sfi/sfidl-cbase.cc
@@ -254,30 +254,30 @@ String CodeGeneratorCBase::createTypeCode (const String& type, const String &nam
        * GValues
        */
       // how to create a new "type" called "name" from a GValue*
-      case MODEL_FROM_VALUE:  assert (name != ""); break;
+      case MODEL_FROM_VALUE:  assert_return (name != "", ""); break;
       // how to convert the "type" called "name" to a GValue*
-      case MODEL_TO_VALUE:    assert (name != ""); break;
+      case MODEL_TO_VALUE:    assert_return (name != "", ""); break;
 
       /*
        * vcall interface: the following models deal with how to perform a
        * method/procedure invocation using a given data type
        */
       // the name of the VCALL function for calling functions returning "type"
-      case MODEL_VCALL:              assert (name == ""); break;
+      case MODEL_VCALL:              assert_return (name == "", ""); break;
       // how to pass a "type" called "name" to the VCALL function
-      case MODEL_VCALL_ARG:   assert (name != ""); break;
+      case MODEL_VCALL_ARG:   assert_return (name != "", ""); break;
       // what type a conversion results in (== MODEL_VCALL_RET ?)
-      case MODEL_VCALL_CARG:  assert (name == ""); break;
+      case MODEL_VCALL_CARG:  assert_return (name == "", ""); break;
       // how to perform the conversion of a vcall parameter called "name" (optional: "" if unused)
-      case MODEL_VCALL_CONV:  assert (name != ""); break;
+      case MODEL_VCALL_CONV:  assert_return (name != "", ""); break;
       // how to free the conversion result of "name" (optional: "" if unused)
-      case MODEL_VCALL_CFREE: assert (name != ""); break;
+      case MODEL_VCALL_CFREE: assert_return (name != "", ""); break;
       // what type a vcall result is
-      case MODEL_VCALL_RET:   assert (name == ""); break;
+      case MODEL_VCALL_RET:   assert_return (name == "", ""); break;
       // how to convert the result of a vcall called "name" (optional: name if unused)
-      case MODEL_VCALL_RCONV: assert (name != ""); break;
+      case MODEL_VCALL_RCONV: assert_return (name != "", ""); break;
       // how to free (using GC) the result of the conversion (optional: "" if unused)
-      case MODEL_VCALL_RFREE: assert (name != ""); break;
+      case MODEL_VCALL_RFREE: assert_return (name != "", ""); break;
     }
 
   switch (parser.typeOf (type))
diff --git a/sfi/sfidl-corec.cc b/sfi/sfidl-corec.cc
index 6e5a638..de65fe4 100644
--- a/sfi/sfidl-corec.cc
+++ b/sfi/sfidl-corec.cc
@@ -119,7 +119,7 @@ class CodeGeneratorCoreC : public CodeGenerator {
       case RECORD:      return TypeName (type, "*");
       case SEQUENCE:    return TypeName (type, "*");
       case OBJECT:      return TypeName (type, "*");
-      default:          assert_unreached(); return NULL;
+      default:          assert_return_unreached (NULL); return NULL;
       }
   }
   const char*
diff --git a/sfi/sfidl-corecxx.cc b/sfi/sfidl-corecxx.cc
index 88fa974..596f4fa 100644
--- a/sfi/sfidl-corecxx.cc
+++ b/sfi/sfidl-corecxx.cc
@@ -365,7 +365,7 @@ public:
       case RECORD:      return make_fqtn (type, "Handle");
       case SEQUENCE:    return make_fqtn (type);
       case OBJECT:      return is_cxx_class (type) ? make_fqtn (type, "*") : make_PrefixedTypeName (type, 
"*");
-      default:          assert_unreached(); return NULL;
+      default:          assert_return_unreached (NULL); return NULL;
       }
   }
   const char*
@@ -386,7 +386,7 @@ public:
       case RECORD:
       case SEQUENCE:    return intern (String ("const ") + TypeField (type) + " &");
       case OBJECT:      return TypeField (type);
-      default:          assert_unreached(); return NULL;
+      default:          assert_return_unreached (NULL); return NULL;
       }
   }
   const char*
@@ -420,7 +420,7 @@ public:
           return intern (String() + "::Bse::CxxBase::value_set_casted< " + type + ", " + type + "Base>");
         else
           return intern (String() + "::Bse::CxxBase::value_set_gobject");
-      default:          assert_unreached(); return NULL;
+      default:          assert_return_unreached (NULL); return NULL;
       }
   }
   const char*
@@ -447,7 +447,7 @@ public:
                          "::Bse::CxxBase::value_get_object< " + make_fqtn (type) + "Base* >");
         else
           return intern (String ("::Bse::CxxBase::value_get_gobject< ") + make_PrefixedTypeName (type) + 
">");
-      default:          assert_unreached(); return NULL;
+      default:          assert_return_unreached (NULL); return NULL;
       }
   }
   const char*
diff --git a/sfi/sfidl-factory.cc b/sfi/sfidl-factory.cc
index 8c344cc..d8cae7c 100644
--- a/sfi/sfidl-factory.cc
+++ b/sfi/sfidl-factory.cc
@@ -19,7 +19,7 @@ Factory::Factory()
 Factory::~Factory()
 {
   list<Factory *>::iterator fi = find (factories->begin(), factories->end(), this);
-  assert (fi != factories->end());
+  assert_return (fi != factories->end());
   factories->erase (fi);
 }
 
diff --git a/sfi/sfidl-generator.cc b/sfi/sfidl-generator.cc
index 1524890..cf20ee8 100644
--- a/sfi/sfidl-generator.cc
+++ b/sfi/sfidl-generator.cc
@@ -161,7 +161,7 @@ String CodeGenerator::toWordCase (const String& word, WordCase wc)
                              break;
          case UPPER:         result += toupper (*si);
                              break;
-         default:            assert_unreached();
+         default:           assert_return_unreached ("");
        }
     }
   return result;
@@ -225,7 +225,7 @@ CodeGenerator::rename (NamespaceHelper& nsh, const String& name, WordCase namesp
                       const String& namespace_join, const vector<String>& namespace_append,
                       WordCase typename_wc, const String& typename_join)
 {
-  assert_unreached ();
+  assert_return_unreached ("");
   String pform = nsh.printableForm (name);
   return pform;
 }
diff --git a/sfi/sfidl-namespace.cc b/sfi/sfidl-namespace.cc
index 19b1e6f..1fb50c1 100644
--- a/sfi/sfidl-namespace.cc
+++ b/sfi/sfidl-namespace.cc
@@ -75,7 +75,7 @@ String NamespaceHelper::printableForm(String symbol)
   while(!current.empty())
     {
       // namespace longer than symbol?
-      assert (!symlist.empty());
+      assert_return (!symlist.empty(), "");
 
       if(*current.begin() == *symlist.begin())
        {
diff --git a/sfi/sfidl-parser.cc b/sfi/sfidl-parser.cc
index 14957dc..1b426fd 100644
--- a/sfi/sfidl-parser.cc
+++ b/sfi/sfidl-parser.cc
@@ -508,7 +508,7 @@ void Parser::preprocessContents (const String& input_filename)
            case '<':   state = filenameIn2;
                        break;
            default:    printerr ("bad char after include statement");
-                       assert_unreached (); // error handling!
+                        assert_return_unreached (); // error handling!
            }
        }
       else if((state == filenameIn1 && *i == '"')
@@ -986,7 +986,7 @@ GTokenType Parser::parseStringOrConst (String &s)
                    s = ci->str;
                    break;
                  default:
-                   assert_unreached ();
+                   assert_return_unreached (G_TOKEN_ERROR);
                    break;
                }
              return G_TOKEN_NONE;
@@ -1008,7 +1008,7 @@ GTokenType Parser::parseConstant (bool isident)
   Constant cdef;
 
   if (isident)
-    assert_unreached (); /* parse_or_return (TOKEN_CONST_IDENT); */
+    assert_return_unreached (G_TOKEN_ERROR); /* parse_or_return (TOKEN_CONST_IDENT); */
   else
     parse_or_return (TOKEN_CONST);
   parse_or_return (G_TOKEN_IDENTIFIER);
@@ -1495,7 +1495,7 @@ GTokenType Parser::parseParamHints (Param &def)
                }
                 break;
               default:
-                assert_unreached ();
+                assert_return_unreached (G_TOKEN_ERROR);
                 break;
               }
           }
diff --git a/sfi/sfifilecrawler.cc b/sfi/sfifilecrawler.cc
index bffa072..12fd611 100644
--- a/sfi/sfifilecrawler.cc
+++ b/sfi/sfifilecrawler.cc
@@ -152,7 +152,7 @@ file_crawler_queue_readdir (SfiFileCrawler *self,
                            const gchar    *file_pattern,
                            GFileTest       file_test)
 {
-  assert (self->dhandle == NULL);
+  assert_return (self->dhandle == NULL);
 
   if (strchr (file_pattern, '?') || strchr (file_pattern, '*'))
     {
@@ -218,7 +218,7 @@ file_crawler_queue_abs_file_path (SfiFileCrawler *self,
 {
   gchar *sep, *p, *freeme, *tmp;
 
-  assert (self->pdqueue == NULL && self->dlist == NULL && self->accu == NULL);
+  assert_return (self->pdqueue == NULL && self->dlist == NULL && self->accu == NULL);
 
   freeme = p = g_strdup (path_pattern);
 
@@ -275,7 +275,7 @@ file_crawler_queue_abs_file_path (SfiFileCrawler *self,
 static void
 file_crawler_crawl_abs_path (SfiFileCrawler *self)
 {
-  assert (self->pdqueue || self->dlist);
+  assert_return (self->pdqueue || self->dlist);
   if (self->dhandle)
     {
       /* finish reading directory contents */
diff --git a/sfi/sfiglue.cc b/sfi/sfiglue.cc
index da25643..6338c23 100644
--- a/sfi/sfiglue.cc
+++ b/sfi/sfiglue.cc
@@ -13,7 +13,7 @@ static GQuark      quark_context_stack = 0;
 void
 _sfi_init_glue (void)
 {
-  assert (quark_context_stack == 0);
+  assert_return (quark_context_stack == 0);
   quark_context_stack = g_quark_from_static_string ("sfi-glue-context-stack");
 }
 void
@@ -150,7 +150,7 @@ sfi_glue_context_destroy (SfiGlueContext *context)
   sfi_glue_context_push (context);
   sfi_glue_gc_run ();
   _sfi_glue_context_clear_proxies (context);
-  assert (context->proxies == NULL);
+  assert_return (context->proxies == NULL);
   sfi_glue_gc_run ();
   sfi_glue_context_pop ();
   destroy = context->table.destroy;
diff --git a/sfi/sfigluecodec.cc b/sfi/sfigluecodec.cc
index 2f30014..ffca6ba 100644
--- a/sfi/sfigluecodec.cc
+++ b/sfi/sfigluecodec.cc
@@ -991,7 +991,7 @@ sfi_glue_decoder_dispatch (SfiGlueDecoder *decoder)
          sfi_seq_unref (seq);
        }
       else
-       assert (rvalue == NULL);
+       assert_return (rvalue == NULL);
     }
 
   /* queue emitted signals */
diff --git a/sfi/sfiparams.cc b/sfi/sfiparams.cc
index 859ba09..d7eac41 100644
--- a/sfi/sfiparams.cc
+++ b/sfi/sfiparams.cc
@@ -77,7 +77,7 @@ _sfi_init_params (void)
   };
   static GType pspec_types[7] = { 0, };
 
-  assert (sfi__param_spec_types == NULL);
+  assert_return (sfi__param_spec_types == NULL);
 
   sfi__param_spec_types = pspec_types;
 
diff --git a/sfi/sfiring.cc b/sfi/sfiring.cc
index 893b1a5..1be2fb7 100644
--- a/sfi/sfiring.cc
+++ b/sfi/sfiring.cc
@@ -262,7 +262,7 @@ static inline SfiRing*
 sfi_ring_unlink_node_dangling (SfiRing *head,
                                SfiRing *node)
 {
-  assert (head && node);
+  assert_return (head && node, head);
   /* special case one item ring */
   if (head->prev == head)
     return NULL;
diff --git a/sfi/sfistore.cc b/sfi/sfistore.cc
index 17a5653..5aa462a 100644
--- a/sfi/sfistore.cc
+++ b/sfi/sfistore.cc
@@ -307,7 +307,7 @@ sfi_wstore_flush_fd (SfiWStore *wstore,
          n = bblock->reader (bblock->data, buffer, bsize);
          if (n < 0)
            break;      // FIXME: error handling
-         assert (n <= int (bsize));
+         assert_return (n <= int (bsize), -EINVAL);
          do
            l = write (fd, buffer, n);
          while (l < 0 && errno == EINTR);
diff --git a/sfi/sfitime.cc b/sfi/sfitime.cc
index cd9d798..20bf9cf 100644
--- a/sfi/sfitime.cc
+++ b/sfi/sfitime.cc
@@ -35,7 +35,7 @@ _sfi_init_time (void)
   time_t t;
   gint error;
 
-  assert (initialized++ == FALSE);
+  assert_return (initialized++ == FALSE);
 
   tzset ();
   error = gettimeofday (&tv, NULL);
diff --git a/sfi/sfivalues.cc b/sfi/sfivalues.cc
index fd78bd5..76329b2 100644
--- a/sfi/sfivalues.cc
+++ b/sfi/sfivalues.cc
@@ -86,7 +86,7 @@ _sfi_init_values (void)
   };
   static GType value_types[6] = { 0, };
 
-  assert (sfi__value_types == NULL);
+  assert_return (sfi__value_types == NULL);
 
   sfi__value_types = value_types;
 
diff --git a/sfi/sfivmarshal.cc b/sfi/sfivmarshal.cc
index 10b7399..aad3e4f 100644
--- a/sfi/sfivmarshal.cc
+++ b/sfi/sfivmarshal.cc
@@ -94,7 +94,7 @@ put_val (Arg          *a,
 #endif
     default:
       t = 0;
-      assert_unreached ();
+      assert_return_unreached (t);
     }
   return t;
 }
@@ -2087,6 +2087,6 @@ sfi_vmarshal_switch (guint sig)
     case 0x3fd: return sfi_vmarshal_33331; /* 241 */
     case 0x3fe: return sfi_vmarshal_33332; /* 242 */
     case 0x3ff: return sfi_vmarshal_33333; /* 243 */
-    default: assert_unreached (); return NULL;
+    default: assert_return_unreached (NULL); return NULL;
     }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]