summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-09-05 14:48:49 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-09-06 17:48:50 +0100
commitacf7f84564688b43fc4c1c67d864c306fa154940 (patch)
treedea913cfcf3452882fa9985672c2e8331cc0dfd3
parentd0a4b26915759cfb8e0b93ef0df5e317cbf66d4a (diff)
mesa: don't use %s for PACKAGE_VERSION macro
The macro itself is a well defined string, which cannot cause issues with printf or other printf-like functions. All other places through Mesa already use it directly, so let's update the final two instances. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
-rw-r--r--src/mesa/main/context.c4
-rw-r--r--src/mesa/main/errors.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index cd3eccea20..be3f361011 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -400,8 +400,8 @@ one_time_init( struct gl_context *ctx )
#if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
if (MESA_VERBOSE != 0) {
- _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
- PACKAGE_VERSION, __DATE__, __TIME__);
+ _mesa_debug(ctx, "Mesa " PACKAGE_VERSION " DEBUG build %s %s\n",
+ __DATE__, __TIME__);
}
#endif
}
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 3a40c7457a..9173788d1d 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -172,8 +172,8 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
va_start( args, fmtString );
_mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args );
va_end( args );
- fprintf(stderr, "Mesa %s implementation error: %s\n",
- PACKAGE_VERSION, str);
+ fprintf(stderr, "Mesa " PACKAGE_VERSION " implementation error: %s\n",
+ str);
fprintf(stderr, "Please report at " PACKAGE_BUGREPORT "\n");
}
}