refactor/drawing: replace magic -1 with INVALID enum

This is clearer and improves type correctness.
astiob · Jan 9, 2024 · 344b8a9 · 344b8a9
1 parent 97435e5
commit 344b8a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libass/ass_drawing.c b/libass/ass_drawing.c
@@ -33,7 +33,7 @@
 /*
  * \brief Check whether a number of items on the list is available
  */
-static bool token_check_values(ASS_DrawingToken *token, int i, int type)
+static bool token_check_values(ASS_DrawingToken *token, int i, ASS_TokenType type)
 {
     for (int j = 0; j < i; j++) {
         if (!token || token->type != type) return false;
@@ -50,7 +50,8 @@ static bool token_check_values(ASS_DrawingToken *token, int i, int type)
 static ASS_DrawingToken *drawing_tokenize(const char *str)
 {
     char *p = (char *) str;
-    int type = -1, is_set = 0;
+    ASS_TokenType type = TOKEN_INVALID;
+    int is_set = 0;
     double val;
     ASS_Vector point = {0, 0};
 
@@ -102,7 +103,7 @@ static ASS_DrawingToken *drawing_tokenize(const char *str)
         if (!got_coord)
             is_set = 0;
 
-        if (type != -1 && is_set == 2) {
+        if (type != TOKEN_INVALID && is_set == 2) {
             if (root) {
                 tail->next = calloc(1, sizeof(ASS_DrawingToken));
                 tail->next->prev = tail;

diff --git a/libass/ass_drawing.h b/libass/ass_drawing.h
@@ -24,6 +24,7 @@
 #include "ass_bitmap.h"
 
 typedef enum {
+    TOKEN_INVALID,
     TOKEN_MOVE,
     TOKEN_MOVE_NC,
     TOKEN_LINE,