3 files changed, 32 insertions, 35 deletions

diff --git a/include/lv2/atom/atom.h b/include/lv2/atom/atom.h
index ca607d3..41af21a 100644
--- a/include/lv2/atom/atom.h
+++ b/include/lv2/atom/atom.h
@@ -68,13 +68,13 @@ extern "C" {
    @param type The type of the atom, for example LV2_Atom_String.
    @param atom A variable-sized atom.
 */
-#define LV2_ATOM_CONTENTS(type, atom) ((void*)((uint8_t*)(atom) + sizeof(type)))
+#define LV2_ATOM_CONTENTS(type, atom) ((void*)((type*)(atom) + 1U))
 
 /**
    Const version of LV2_ATOM_CONTENTS.
 */
 #define LV2_ATOM_CONTENTS_CONST(type, atom) \
-  ((const void*)((const uint8_t*)(atom) + sizeof(type)))
+  ((const void*)((const type*)(atom) + 1U))
 
 /**
    Return a pointer to the body of an Atom.  The "body" of an atom is the
diff --git a/include/lv2/atom/forge.h b/include/lv2/atom/forge.h
index f894a5a..58b7512 100644
--- a/include/lv2/atom/forge.h
+++ b/include/lv2/atom/forge.h
@@ -38,10 +38,10 @@
    @{
 */
 
-#include "lv2/atom/atom.h"
-#include "lv2/atom/util.h"
-#include "lv2/core/attributes.h"
-#include "lv2/urid/urid.h"
+#include <lv2/atom/atom.h>
+#include <lv2/atom/util.h>
+#include <lv2/core/attributes.h>
+#include <lv2/urid/urid.h>
 
 #include <assert.h>
 #include <stdbool.h>
@@ -90,24 +90,24 @@ typedef struct {
 
   LV2_Atom_Forge_Frame* stack;
 
-  LV2_URID Blank    LV2_DEPRECATED;
-  LV2_URID          Bool;
-  LV2_URID          Chunk;
-  LV2_URID          Double;
-  LV2_URID          Float;
-  LV2_URID          Int;
-  LV2_URID          Long;
-  LV2_URID          Literal;
-  LV2_URID          Object;
-  LV2_URID          Path;
-  LV2_URID          Property;
+  LV2_URID Blank LV2_DEPRECATED;
+  LV2_URID Bool;
+  LV2_URID Chunk;
+  LV2_URID Double;
+  LV2_URID Float;
+  LV2_URID Int;
+  LV2_URID Long;
+  LV2_URID Literal;
+  LV2_URID Object;
+  LV2_URID Path;
+  LV2_URID Property;
   LV2_URID Resource LV2_DEPRECATED;
-  LV2_URID          Sequence;
-  LV2_URID          String;
-  LV2_URID          Tuple;
-  LV2_URID          URI;
-  LV2_URID          URID;
-  LV2_URID          Vector;
+  LV2_URID Sequence;
+  LV2_URID String;
+  LV2_URID Tuple;
+  LV2_URID URI;
+  LV2_URID URID;
+  LV2_URID Vector;
 } LV2_Atom_Forge;
 
 static inline void
@@ -492,7 +492,7 @@ lv2_atom_forge_vector(LV2_Atom_Forge* forge,
                       const void*     elems)
 {
   const LV2_Atom_Vector a = {
-    {(uint32_t)sizeof(LV2_Atom_Vector_Body) + n_elems * child_size,
+    {(uint32_t)sizeof(LV2_Atom_Vector_Body) + (n_elems * child_size),
      forge->Vector},
     {child_size, child_type}};
   const LV2_Atom_Forge_Ref out = lv2_atom_forge_write(forge, &a, sizeof(a));
@@ -569,8 +569,7 @@ lv2_atom_forge_object(LV2_Atom_Forge*       forge,
    This function is deprecated and should not be used in new code.
    Use lv2_atom_forge_object() directly instead.
 */
-LV2_DEPRECATED
-static inline LV2_Atom_Forge_Ref
+LV2_DEPRECATED static inline LV2_Atom_Forge_Ref
 lv2_atom_forge_resource(LV2_Atom_Forge*       forge,
                         LV2_Atom_Forge_Frame* frame,
                         LV2_URID              id,
@@ -588,8 +587,7 @@ lv2_atom_forge_resource(LV2_Atom_Forge*       forge,
    This function is deprecated and should not be used in new code.
    Use lv2_atom_forge_object() directly instead.
 */
-LV2_DEPRECATED
-static inline LV2_Atom_Forge_Ref
+LV2_DEPRECATED static inline LV2_Atom_Forge_Ref
 lv2_atom_forge_blank(LV2_Atom_Forge*       forge,
                      LV2_Atom_Forge_Frame* frame,
                      uint32_t              id,
diff --git a/include/lv2/atom/util.h b/include/lv2/atom/util.h
index b1a1e93..9a3d8a3 100644
--- a/include/lv2/atom/util.h
+++ b/include/lv2/atom/util.h
@@ -1,4 +1,4 @@
-// Copyright 2008-2015 David Robillard <d@drobilla.net>
+// Copyright 2008-2024 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
 #ifndef LV2_ATOM_UTIL_H
@@ -13,7 +13,7 @@
 */
 
 /**
-   @defgroup util Utilities
+   @defgroup atom_util Utilities
    @ingroup atom
 
    Utilities for working with atoms.
@@ -21,7 +21,7 @@
    @{
 */
 
-#include "lv2/atom/atom.h"
+#include <lv2/atom/atom.h>
 
 #include <stdarg.h>
 #include <stdbool.h>
@@ -61,8 +61,7 @@ lv2_atom_is_null(const LV2_Atom* atom)
 static inline bool
 lv2_atom_equals(const LV2_Atom* a, const LV2_Atom* b)
 {
-  return (a == b) || ((a->type == b->type) && (a->size == b->size) &&
-                      !memcmp(a + 1, b + 1, a->size));
+  return (a == b) || !memcmp(a, b, sizeof(LV2_Atom) + a->size);
 }
 
 /**
@@ -182,7 +181,7 @@ lv2_atom_sequence_append_event(LV2_Atom_Sequence*    seq,
 static inline LV2_Atom*
 lv2_atom_tuple_begin(const LV2_Atom_Tuple* tup)
 {
-  return (LV2_Atom*)(LV2_ATOM_BODY(tup));
+  return (LV2_Atom*)tup + 1U;
 }
 
 /** Return true iff `i` has reached the end of `body`. */
@@ -252,7 +251,7 @@ static inline LV2_Atom_Property_Body*
 lv2_atom_object_next(const LV2_Atom_Property_Body* i)
 {
   const LV2_Atom* const value =
-    (const LV2_Atom*)((const uint8_t*)i + 2 * sizeof(uint32_t));
+    (const LV2_Atom*)((const uint8_t*)i + (2 * sizeof(uint32_t)));
   return (LV2_Atom_Property_Body*)((const uint8_t*)i +
                                    lv2_atom_pad_size(
                                      (uint32_t)sizeof(LV2_Atom_Property_Body) +