Re: [Mesa-dev] [PATCH 1/4] mesa: s/MALLOC/malloc/

[Brian Paul]

On 08/31/2012 01:44 AM, Kenneth Graunke wrote:

For the series:
Reviewed-by: Kenneth Graunke


Thanks (and Matt).  But I found some more instances of this macro down 
in the src/mesa/dri/common/ code that I missed before (by grepping 
with 'MALLOC(' while the code reads 'MALLOC (', ugh).


I'll post v2 patches.



I'd also go ahead and cherry-pick these to 9.0, as it ought to make
later cherry-picking easier...and the branch is still really young anyway.


Yeah, I'd like to do that too.

-Brian
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/4] mesa: s/MALLOC/malloc/

[Kenneth Graunke]

For the series:
Reviewed-by: Kenneth Graunke 

I'd also go ahead and cherry-pick these to 9.0, as it ought to make
later cherry-picking easier...and the branch is still really young anyway.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/4] mesa: s/MALLOC/malloc/

[Brian Paul]

From: Brian Paul 

---
 src/gallium/state_trackers/glx/xlib/glx_usefont.c |2 +-
 src/gallium/state_trackers/glx/xlib/xm_api.c  |4 ++--
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c  |2 +-
 src/mesa/drivers/x11/xfonts.c |2 +-
 src/mesa/drivers/x11/xm_api.c |4 ++--
 src/mesa/drivers/x11/xm_buffer.c  |2 +-
 src/mesa/main/attrib.c|2 +-
 src/mesa/main/errors.c|2 +-
 src/mesa/main/eval.c  |   16 
 src/mesa/main/teximage.c  |2 +-
 src/mesa/program/nvfragparse.c|2 +-
 src/mesa/program/nvvertparse.c|2 +-
 src/mesa/swrast/s_context.c   |2 +-
 src/mesa/swrast/s_texcombine.c|2 +-
 src/mesa/tnl/t_vb_fog.c   |2 +-
 src/mesa/tnl/t_vb_light.c |2 +-
 src/mesa/tnl/t_vb_texgen.c|4 ++--
 src/mesa/vbo/vbo_save_api.c   |2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c 
b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index fa5c93a..5dac7a7 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -241,7 +241,7 @@ glXUseXFont(Font font, int first, int count, int listbase)
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
 
-   bm = (GLubyte *) MALLOC((max_bm_width * max_bm_height) * sizeof(GLubyte));
+   bm = (GLubyte *) malloc((max_bm_width * max_bm_height) * sizeof(GLubyte));
if (!bm) {
   XFreeFontInfo(NULL, fs, 1);
   _mesa_error(NULL, GL_OUT_OF_MEMORY,
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c 
b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 8f90704..ef275b2 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -220,7 +220,7 @@ bits_per_pixel( XMesaVisual xmv )
/* Create a temporary XImage */
img = XCreateImage( dpy, visinfo->visual, visinfo->depth,
   ZPixmap, 0,   /*format, offset*/
-  (char*) MALLOC(8),/*data*/
+  (char*) malloc(8),/*data*/
   1, 1, /*width, height*/
   32,   /*bitmap_pad*/
   0 /*bytes_per_line*/
@@ -706,7 +706,7 @@ XMesaVisual XMesaCreateVisual( Display *display,
 * the struct but we may need some of the information contained in it
 * at a later time.
 */
-   v->visinfo = (XVisualInfo *) MALLOC(sizeof(*visinfo));
+   v->visinfo = (XVisualInfo *) malloc(sizeof(*visinfo));
if (!v->visinfo) {
   free(v);
   return NULL;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c 
b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
index 1782714..1d7db52 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
@@ -90,7 +90,7 @@ nouveau_bufferobj_data(struct gl_context *ctx, GLenum target, 
GLsizeiptrARB size
(size < 512 && usage == GL_DYNAMIC_DRAW_ARB) ||
context_chipset(ctx) < 0x10) {
/* Heuristic: keep it in system ram */
-   nbo->sys = MALLOC(size);
+   nbo->sys = malloc(size);
 
} else {
/* Get a hardware BO */
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 91f819b..ac275bb 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -247,7 +247,7 @@ Fake_glXUseXFont(Font font, int first, int count, int 
listbase)
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
 
-   bm = (GLubyte *) MALLOC((max_bm_width * max_bm_height) * sizeof(GLubyte));
+   bm = (GLubyte *) malloc((max_bm_width * max_bm_height) * sizeof(GLubyte));
if (!bm) {
   XFreeFontInfo(NULL, fs, 1);
   _mesa_error(NULL, GL_OUT_OF_MEMORY,
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 249bbdf..6696f70 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -171,7 +171,7 @@ bits_per_pixel( XMesaVisual xmv )
/* Create a temporary XImage */
img = XCreateImage( dpy, visinfo->visual, visinfo->depth,
   ZPixmap, 0,   /*format, offset*/
-  (char*) MALLOC(8),/*data*/
+  (char*) malloc(8),/*data*/
   1, 1, /*width, height*/
   32,   /*bitmap_pad*/
   0 /*bytes_per_line*/
@@ -781,7 +781,7 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
 * the struct but we may need some