OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: s/sprintf/_mesa_snprintf/

Browse Source
This commit is contained in:
Vinson Lee
2010-05-02 01:03:59 -07:00
parent 3c86e2f1dc
commit fc1be4a994
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/debug.c
View File

@@ -315,7 +315,7 @@ write_texture_image(struct gl_texture_object *texObj,
buffer, texObj, img); buffer, texObj, img);
/* make filename */ /* make filename */
sprintf(s, "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face); _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
printf(" Writing image level %u to %s\n", level, s); printf(" Writing image level %u to %s\n", level, s);
write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE); write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);
@@ -357,7 +357,7 @@ write_renderbuffer_image(const struct gl_renderbuffer *rb)
format, type, &ctx->DefaultPacking, buffer); format, type, &ctx->DefaultPacking, buffer);
/* make filename */ /* make filename */
sprintf(s, "/tmp/renderbuffer%u.ppm", rb->Name); _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);
printf(" Writing renderbuffer image to %s\n", s); printf(" Writing renderbuffer image to %s\n", s);
write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE); write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);

2
src/mesa/main/dlist.c
View File

@@ -7725,7 +7725,7 @@ execute_list(GLcontext *ctx, GLuint list)
default: default:
{ {
char msg[1000]; char msg[1000];
sprintf(msg, "Error in execute_list: opcode=%d", _mesa_snprintf(msg, sizeof(msg), "Error in execute_list: opcode=%d",
(int) opcode); (int) opcode);
_mesa_problem(ctx, msg); _mesa_problem(ctx, msg);
} }

2
src/mesa/main/enums.c
View File

@@ -5279,7 +5279,7 @@ const char *_mesa_lookup_enum_by_nr( int nr )
} }
else { else {
/* this is not re-entrant safe, no big deal here */ /* this is not re-entrant safe, no big deal here */
sprintf(token_tmp, "0x%x", nr); _mesa_snprintf(token_tmp, sizeof(token_tmp), "0x%x", nr);
return token_tmp; return token_tmp;
} }
} }

2
src/mesa/main/shaders.c
View File

@@ -485,7 +485,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
checksum = _mesa_str_checksum(source); checksum = _mesa_str_checksum(source);
sprintf(filename, "newshader_%d", checksum); _mesa_snprintf(filename, sizeof(filename), "newshader_%d", checksum);
newSource = _mesa_read_shader(filename); newSource = _mesa_read_shader(filename);
if (newSource) { if (newSource) {

10
src/mesa/main/teximage.c
View File

@@ -1279,8 +1279,8 @@ texture_error_check( GLcontext *ctx, GLenum target,
if (type != GL_UNSIGNED_SHORT_8_8_MESA && if (type != GL_UNSIGNED_SHORT_8_8_MESA &&
type != GL_UNSIGNED_SHORT_8_8_REV_MESA) { type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {
char message[100]; char message[100];
sprintf(message, _mesa_snprintf(message, sizeof(message),
"glTexImage%d(format/type YCBCR mismatch", dimensions); "glTexImage%d(format/type YCBCR mismatch", dimensions);
_mesa_error(ctx, GL_INVALID_ENUM, message); _mesa_error(ctx, GL_INVALID_ENUM, message);
return GL_TRUE; /* error */ return GL_TRUE; /* error */
} }
@@ -1295,9 +1295,9 @@ texture_error_check( GLcontext *ctx, GLenum target,
if (border != 0) { if (border != 0) {
if (!isProxy) { if (!isProxy) {
char message[100]; char message[100];
sprintf(message, _mesa_snprintf(message, sizeof(message),
"glTexImage%d(format=GL_YCBCR_MESA and border=%d)", "glTexImage%d(format=GL_YCBCR_MESA and border=%d)",
dimensions, border); dimensions, border);
_mesa_error(ctx, GL_INVALID_VALUE, message); _mesa_error(ctx, GL_INVALID_VALUE, message);
} }
return GL_TRUE; return GL_TRUE;

4
src/mesa/main/texobj.c
View File

@@ -416,7 +416,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
*/ */
if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) { if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) {
char s[100]; char s[100];
sprintf(s, "base level = %d is invalid", baseLevel); _mesa_snprintf(s, sizeof(s), "base level = %d is invalid", baseLevel);
incomplete(t, s); incomplete(t, s);
t->_Complete = GL_FALSE; t->_Complete = GL_FALSE;
return; return;
@@ -425,7 +425,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
/* Always need the base level image */ /* Always need the base level image */
if (!t->Image[0][baseLevel]) { if (!t->Image[0][baseLevel]) {
char s[100]; char s[100];
sprintf(s, "Image[baseLevel=%d] == NULL", baseLevel); _mesa_snprintf(s, sizeof(s), "Image[baseLevel=%d] == NULL", baseLevel);
incomplete(t, s); incomplete(t, s);
t->_Complete = GL_FALSE; t->_Complete = GL_FALSE;
return; return;