Changeset 1569a9b in mainline for uspace/app/fontviewer/fontviewer.c

Timestamp:

2017-12-24T16:40:33Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

File:

• uspace/app/fontviewer/fontviewer.c (modified) (1 diff)

uspace/app/fontviewer/fontviewer.c

@@ -149 +149 @@
         va_end(args);
         
-        if (ret <= 0)
-                return ret;
-        
-        drawctx_set_source(drawctx, source);
-        drawctx_set_font(drawctx, font);
-        drawctx_print(drawctx, str, x, y);
-        
-        free(str);
+        if (ret >= 0) {
+                drawctx_set_source(drawctx, source);
+                drawctx_set_font(drawctx, font);
+                drawctx_print(drawctx, str, x, y);
+
+                free(str);
+        }
         
         return ret;