From 4ded23a4add49c887f764c221f1aab5e0019cee2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 6 Mar 2020 14:35:02 -0500 Subject: [PATCH] glthread: simplify printing safe_mul in gl_marshal.py Reviewed-by: Timothy Arceri Part-of: --- src/mapi/glapi/gen/gl_marshal.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py index 6403b75bbc6..d4bbcd44a48 100644 --- a/src/mapi/glapi/gen/gl_marshal.py +++ b/src/mapi/glapi/gen/gl_marshal.py @@ -37,6 +37,14 @@ header = """ #include "marshal.h" #define COMPAT (ctx->API != API_OPENGL_CORE) + +static inline int safe_mul(int a, int b) +{ + if (a < 0 || b < 0) return -1; + if (a == 0 || b == 0) return 0; + if (a > INT_MAX / b) return -1; + return a * b; +} """ @@ -68,14 +76,6 @@ class PrintCode(gl_XML.gl_print_base): def printRealHeader(self): print(header) - print('static inline int safe_mul(int a, int b)') - print('{') - print(' if (a < 0 || b < 0) return -1;') - print(' if (a == 0 || b == 0) return 0;') - print(' if (a > INT_MAX / b) return -1;') - print(' return a * b;') - print('}') - print() def printRealFooter(self): pass -- 2.30.2