mesa: s/FREE/free/

v2: replace instances in dri/common/ dirs

Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>

19 files changed, 55 insertions, 55 deletions

diff --git a/src/mesa/drivers/dri/common/drisw_util.c b/src/mesa/drivers/dri/common/drisw_util.c
index 0ec124ae537..d6927485425 100644
--- a/src/mesa/drivers/dri/common/drisw_util.c
+++ b/src/mesa/drivers/dri/common/drisw_util.c
@@ -68,7 +68,7 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions,
 
     *driver_configs = driDriverAPI.InitScreen(psp);
     if (*driver_configs == NULL) {
-	FREE(psp);
+	free(psp);
 	return NULL;
     }
 
@@ -79,7 +79,7 @@ static void driDestroyScreen(__DRIscreen *psp)
 {
     if (psp) {
 	driDriverAPI.DestroyScreen(psp);
-	FREE(psp);
+	free(psp);
     }
 }
 
@@ -178,7 +178,7 @@ driCreateContextAttribs(__DRIscreen *screen, int api,
     if (!driDriverAPI.CreateContext(mesa_api, modes, pcp,
 				    major_version, minor_version,
 				    flags, error, shareCtx)) {
-        FREE(pcp);
+        free(pcp);
         return NULL;
     }
 
@@ -209,7 +209,7 @@ driDestroyContext(__DRIcontext *pcp)
 {
     if (pcp) {
 	driDriverAPI.DestroyContext(pcp);
-	FREE(pcp);
+	free(pcp);
     }
 }
 
@@ -289,7 +289,7 @@ static void dri_put_drawable(__DRIdrawable *pdp)
 	    return;
 
 	driDriverAPI.DestroyBuffer(pdp);
-	FREE(pdp);
+	free(pdp);
     }
 }
 
@@ -311,7 +311,7 @@ driCreateNewDrawable(__DRIscreen *psp,
     dri_get_drawable(pdp);
 
     if (!driDriverAPI.CreateBuffer(psp, pdp, &config->modes, GL_FALSE)) {
-	FREE(pdp);
+	free(pdp);
 	return NULL;
     }
 
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index e48ceb4a93b..92974840050 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -382,9 +382,9 @@ static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) {
 	else
 	    range = NULL;
     }
-    FREE (cp);
+    free(cp);
     if (i < nRanges) {
-	FREE (ranges);
+	free(ranges);
 	return GL_FALSE;
     } else
 	assert (range == NULL);
@@ -990,7 +990,7 @@ void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,
     }
 
     if (filenames[1])
-	FREE (filenames[1]);
+	free(filenames[1]);
 }
 
 void driDestroyOptionInfo (driOptionCache *info) {
@@ -999,18 +999,18 @@ void driDestroyOptionInfo (driOptionCache *info) {
 	GLuint i, size = 1 << info->tableSize;
 	for (i = 0; i < size; ++i) {
 	    if (info->info[i].name) {
-		FREE (info->info[i].name);
+		free(info->info[i].name);
 		if (info->info[i].ranges)
-		    FREE (info->info[i].ranges);
+		    free(info->info[i].ranges);
 	    }
 	}
-	FREE (info->info);
+	free(info->info);
     }
 }
 
 void driDestroyOptionCache (driOptionCache *cache) {
     if (cache->values)
-	FREE (cache->values);
+	free(cache->values);
 }
 
 GLboolean driCheckOption (const driOptionCache *cache, const char *name,
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 663909ea4b6..3da07455776 100644
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -65,7 +65,7 @@ i830CreateContext(const struct gl_config * mesaVis,
 
    if (!intelInitContext(intel, __DRI_API_OPENGL, mesaVis, driContextPriv,
                          sharedContextPrivate, &functions)) {
-      FREE(i830);
+      free(i830);
       return false;
    }
 
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 1a0baa2965c..8ae1e580ed6 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -167,7 +167,7 @@ i915CreateContext(int api,
 
    if (!intelInitContext(intel, api, mesaVis, driContextPriv,
                          sharedContextPrivate, &functions)) {
-      FREE(i915);
+      free(i915);
       *error = __DRI_CTX_ERROR_NO_MEMORY;
       return false;
    }
@@ -184,7 +184,7 @@ i915CreateContext(int api,
 
       if (req_version > max_version) {
          *error = __DRI_CTX_ERROR_BAD_VERSION;
-         FREE(i915);
+         free(i915);
          return false;
       }
       break;
@@ -194,7 +194,7 @@ i915CreateContext(int api,
       break;
    default:
       *error = __DRI_CTX_ERROR_BAD_API;
-      FREE(i915);
+      free(i915);
       return false;
    }
 
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 4e5aed69302..1083e28ce3b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -148,7 +148,7 @@ brwCreateContext(int api,
    if (!intelInitContext( intel, api, mesaVis, driContextPriv,
 			  sharedContextPrivate, &functions )) {
       printf("%s: failed to init intel context\n", __FUNCTION__);
-      FREE(brw);
+      free(brw);
       *error = __DRI_CTX_ERROR_NO_MEMORY;
       return false;
    }
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c
index 8823b22357d..c39d589a1e9 100644
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_state_cache.c
@@ -120,7 +120,7 @@ rehash(struct brw_cache *cache)
 	 items[c->hash % size] = c;
       }
 
-   FREE(cache->items);
+   free(cache->items);
    cache->items = items;
    cache->size = size;
 }
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 6c53b4762e7..3470db642c6 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -309,7 +309,7 @@ intel_create_image_from_name(__DRIscreen *screen,
 						  cpp, width, height,
 						  pitch, name, "image");
     if (image->region == NULL) {
-       FREE(image);
+       free(image);
        return NULL;
     }
 
@@ -371,7 +371,7 @@ static void
 intel_destroy_image(__DRIimage *image)
 {
     intel_region_release(&image->region);
-    FREE(image);
+    free(image);
 }
 
 static __DRIimage *
@@ -397,7 +397,7 @@ intel_create_image(__DRIscreen *screen,
    image->region =
       intel_region_alloc(intelScreen, tiling, cpp, width, height, true);
    if (image->region == NULL) {
-      FREE(image);
+      free(image);
       return NULL;
    }
    
@@ -446,7 +446,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate)
 
    intel_region_reference(&image->region, orig_image->region);
    if (image->region == NULL) {
-      FREE(image);
+      free(image);
       return NULL;
    }
 
@@ -543,13 +543,13 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
     pitch = stride / cpp;
     if (offset + height * cpp * pitch > parent->region->bo->size) {
        _mesa_warning(NULL, "intel_create_sub_image: subimage out of bounds");
-       FREE(image);
+       free(image);
        return NULL;
     }
 
     image->region = calloc(sizeof(*image->region), 1);
     if (image->region == NULL) {
-       FREE(image);
+       free(image);
        return NULL;
     }
 
@@ -639,7 +639,7 @@ intelDestroyScreen(__DRIscreen * sPriv)
    _mesa_HashDeleteAll(intelScreen->named_regions, nop_callback, NULL);
    _mesa_DeleteHashTable(intelScreen->named_regions);
 
-   FREE(intelScreen);
+   free(intelScreen);
    sPriv->driverPrivate = NULL;
 }
 
@@ -1156,7 +1156,7 @@ intelAllocateBuffer(__DRIscreen *screen,
                                             true);
    
    if (intelBuffer->region == NULL) {
-	   FREE(intelBuffer);
+	   free(intelBuffer);
 	   return NULL;
    }
    
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
index 1d7db52c43a..717c0b8f11d 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
@@ -67,8 +67,8 @@ nouveau_bufferobj_del(struct gl_context *ctx, struct gl_buffer_object *obj)
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
 
 	nouveau_bo_ref(NULL, &nbo->bo);
-	FREE(nbo->sys);
-	FREE(nbo);
+	free(nbo->sys);
+	free(nbo);
 }
 
 static GLboolean
@@ -84,7 +84,7 @@ nouveau_bufferobj_data(struct gl_context *ctx, GLenum target, GLsizeiptrARB size
 
 	/* Free previous storage */
 	nouveau_bo_ref(NULL, &nbo->bo);
-	FREE(nbo->sys);
+	free(nbo->sys);
 
 	if (target == GL_ELEMENT_ARRAY_BUFFER_ARB ||
 	    (size < 512 && usage == GL_DYNAMIC_DRAW_ARB) ||
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 3f65c36f29b..4f78a82846d 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -144,7 +144,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
 
 	nouveau_device_del(&screen->device);
 
-	FREE(screen);
+	free(screen);
 	dri_screen->driverPrivate = NULL;
 }
 
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c
index 9472bdd7b51..829aa87c473 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.c
@@ -134,7 +134,7 @@ nv04_context_destroy(struct gl_context *ctx)
 	nouveau_object_del(&nctx->hw.surf3d);
 
 	nouveau_context_deinit(ctx);
-	FREE(ctx);
+	free(ctx);
 }
 
 static struct gl_context *
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index a2448caaf81..97fc84d0a85 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -423,7 +423,7 @@ nv10_context_destroy(struct gl_context *ctx)
 	nouveau_object_del(&nctx->hw.eng3d);
 
 	nouveau_context_deinit(ctx);
-	FREE(ctx);
+	free(ctx);
 }
 
 static struct gl_context *
diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c
index 5a36c8766d7..52013fd2008 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_context.c
@@ -434,7 +434,7 @@ nv20_context_destroy(struct gl_context *ctx)
 	nouveau_object_del(&nctx->hw.eng3d);
 
 	nouveau_context_deinit(ctx);
-	FREE(ctx);
+	free(ctx);
 }
 
 static struct gl_context *
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 523a89dfc5e..f8add0f309d 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -281,7 +281,7 @@ GLboolean r200CreateContext( gl_api api,
    if (!radeonInitContext(&rmesa->radeon, &functions,
 			  glVisual, driContextPriv,
 			  sharedContextPrivate)) {
-     FREE(rmesa);
+     free(rmesa);
      *error = __DRI_CTX_ERROR_NO_MEMORY;
      return GL_FALSE;
    }
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 8ea8925d8a2..6a56891ba41 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -202,9 +202,9 @@ static void radeon_destroy_atom_list(radeonContextPtr radeon)
 	struct radeon_state_atom *atom;
 
 	foreach(atom, &radeon->hw.atomlist) {
-		FREE(atom->cmd);
+		free(atom->cmd);
 		if (atom->lastcmd)
-			FREE(atom->lastcmd);
+			free(atom->lastcmd);
 	}
 
 }
@@ -267,7 +267,7 @@ void radeonDestroyContext(__DRIcontext *driContextPriv )
 		fclose(track);
 	}
 #endif
-	FREE(radeon);
+	free(radeon);
 }
 
 /* Force the context `c' to be unbound from its buffer.
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index ebc0c697003..2b99e36b2a3 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -243,7 +243,7 @@ r100CreateContext( gl_api api,
    if (!radeonInitContext(&rmesa->radeon, &functions,
 			  glVisual, driContextPriv,
 			  sharedContextPrivate)) {
-     FREE(rmesa);
+     free(rmesa);
      *error = __DRI_CTX_ERROR_NO_MEMORY;
      return GL_FALSE;
    }
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c
index 61cddda5dc1..2ffbc6df9af 100644
--- a/src/mesa/drivers/dri/radeon/radeon_dma.c
+++ b/src/mesa/drivers/dri/radeon/radeon_dma.c
@@ -302,19 +302,19 @@ void radeonFreeDmaRegions(radeonContextPtr rmesa)
 	foreach_s(dma_bo, temp, &rmesa->dma.free) {
 		remove_from_list(dma_bo);
 	        radeon_bo_unref(dma_bo->bo);
-		FREE(dma_bo);
+		free(dma_bo);
 	}
 
 	foreach_s(dma_bo, temp, &rmesa->dma.wait) {
 		remove_from_list(dma_bo);
 	        radeon_bo_unref(dma_bo->bo);
-		FREE(dma_bo);
+		free(dma_bo);
 	}
 
 	foreach_s(dma_bo, temp, &rmesa->dma.reserved) {
 		remove_from_list(dma_bo);
 	        radeon_bo_unref(dma_bo->bo);
-		FREE(dma_bo);
+		free(dma_bo);
 	}
 }
 
@@ -344,7 +344,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
 {
 	struct radeon_dma_bo *dma_bo;
 	struct radeon_dma_bo *temp;
-	const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_FREE_TIME;
+	const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_free_TIME;
 	const int time = rmesa->dma.free.expire_counter;
 
 	if (RADEON_DEBUG & RADEON_DMA) {
@@ -371,14 +371,14 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
 			WARN_ONCE("Leaking dma buffer object!\n");
 			radeon_bo_unref(dma_bo->bo);
 			remove_from_list(dma_bo);
-			FREE(dma_bo);
+			free(dma_bo);
 			continue;
 		}
 		/* free objects that are too small to be used because of large request */
 		if (dma_bo->bo->size < rmesa->dma.minimum_size) {
 		   radeon_bo_unref(dma_bo->bo);
 		   remove_from_list(dma_bo);
-		   FREE(dma_bo);
+		   free(dma_bo);
 		   continue;
 		}
 		if (!radeon_bo_is_idle(dma_bo->bo)) {
@@ -396,7 +396,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
 		if (dma_bo->bo->size < rmesa->dma.minimum_size) {
 		   radeon_bo_unref(dma_bo->bo);
 		   remove_from_list(dma_bo);
-		   FREE(dma_bo);
+		   free(dma_bo);
 		   continue;
 		}
 		remove_from_list(dma_bo);
@@ -410,7 +410,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
 			break;
 		remove_from_list(dma_bo);
 	        radeon_bo_unref(dma_bo->bo);
-		FREE(dma_bo);
+		free(dma_bo);
 	}
 
 }
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8384eb1c912..acd4cc1e2c5 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -251,7 +251,7 @@ radeon_create_image_from_name(__DRIscreen *screen,
                               0);
 
    if (image->bo == NULL) {
-      FREE(image);
+      free(image);
       return NULL;
    }
 
@@ -298,7 +298,7 @@ static void
 radeon_destroy_image(__DRIimage *image)
 {
    radeon_bo_unref(image->bo);
-   FREE(image);
+   free(image);
 }
 
 static __DRIimage *
@@ -351,7 +351,7 @@ radeon_create_image(__DRIscreen *screen,
                               0);
 
    if (image->bo == NULL) {
-      FREE(image);
+      free(image);
       return NULL;
    }
 
@@ -507,7 +507,7 @@ radeonCreateScreen2(__DRIscreen *sPriv)
 
    ret = radeonGetParam(sPriv, RADEON_PARAM_DEVICE_ID, &device_id);
    if (ret) {
-     FREE( screen );
+     free( screen );
      fprintf(stderr, "drm_radeon_getparam_t (RADEON_PARAM_DEVICE_ID): %d\n", ret);
      return NULL;
    }
@@ -561,7 +561,7 @@ radeonDestroyScreen( __DRIscreen *sPriv )
     /* free all option information */
     driDestroyOptionInfo (&screen->optionCache);
 
-    FREE( screen );
+    free( screen );
     sPriv->driverPrivate = NULL;
 }
 
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index f0ff0b0aaf3..5ce1eb02942 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -504,7 +504,7 @@ drawable_fail:
     if (drawable)
 	free(drawable->row);
 
-    FREE(drawable);
+    free(drawable);
 
     return GL_FALSE;
 }
@@ -806,7 +806,7 @@ dri_create_context(gl_api api,
 
 context_fail:
 
-    FREE(ctx);
+    free(ctx);
 
     return GL_FALSE;
 }
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index ac275bb6aef..183de40554b 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -363,7 +363,7 @@ Fake_glXUseXFont(Font font, int first, int count, int listbase)
       glEndList();
    }
 
-   FREE(bm);
+   free(bm);
    XFreeFontInfo(NULL, fs, 1);
    XFreeGC(dpy, gc);