refstr_get(): handle NULL, force inline

Make refstr_get() handle NULL correctly; force it to be an inline
since it seems to make no difference for code size.

diff --git a/com32/menu/refstr.h b/com32/menu/refstr.h
index 593b0ab..8bec018 100644 (file)
--- a/com32/menu/refstr.h
+++ b/com32/menu/refstr.h
@@ -22,10 +22,11 @@
 #include <stddef.h>
 #include <stdarg.h>
 
-static inline const char *refstr_get(const char *r)
+static inline __attribute__((always_inline))
+const char *refstr_get(const char *r)
 {
-  unsigned int *ref = (unsigned int *)r - 1;
-  ref++;
+  if (r)
+    ((unsigned int *)r)[-1]++;
   return r;
 }