Changeset 3bacee1 in mainline for uspace/lib/c/include

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/lib/c/include

Files:

• adt/hash.h (modified) (1 diff)
• io/charfield.h (modified) (1 diff)

uspace/lib/c/include/adt/hash.h

@@ -106 +106 @@
          * http://burtleburtle.net/bob/c/lookup3.c
          */
-        seed ^= hash + 0x9e3779b9
-                + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5)));
+        seed ^= hash + 0x9e3779b9 +
+            ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5)));
         return seed;
 }

uspace/lib/c/include/io/charfield.h

@@ -91 +91 @@
                 return (a1.val.style == a2.val.style);
         case CHAR_ATTR_INDEX:
-                return (a1.val.index.bgcolor == a2.val.index.bgcolor)
-                    && (a1.val.index.fgcolor == a2.val.index.fgcolor)
-                    && (a1.val.index.attr == a2.val.index.attr);
+                return (a1.val.index.bgcolor == a2.val.index.bgcolor) &&
+                    (a1.val.index.fgcolor == a2.val.index.fgcolor) &&
+                    (a1.val.index.attr == a2.val.index.attr);
         case CHAR_ATTR_RGB:
-                return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor)
-                    && (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor);
+                return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) &&
+                    (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor);
         }