fix some valgrind complaints

diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c
index 9691627ebc388a991380f4e79b35ea877529673a..83bb77f38519224a9aa6132a7e544e754e51121f 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915/intel_ioctl.c
@@ -45,7 +45,7 @@
 static int intelEmitIrqLocked( intelContextPtr intel )
 {
    drmI830IrqEmit ie;
-   int ret, seq;
+   int ret, seq = 0;
       
    assert(((*(int *)intel->driHwLock) & ~DRM_LOCK_CONT) == 
          (DRM_LOCK_HELD|intel->hHWContext));
@@ -398,7 +398,7 @@ void intelClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
 
 void *intelAllocateAGP( intelContextPtr intel, GLsizei size )
 {
-   int region_offset;
+   int region_offset = 0;
    drmI830MemAlloc alloc;
    int ret;
 

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 06caa1a6bea246d32ace85c71d432add398c38df..082c36b88e19051484b191af6b0e6338368d3819 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -81,7 +81,7 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv)
 
 
    /* Allocate the private area */
-   intelScreen = (intelScreenPrivate *)MALLOC(sizeof(intelScreenPrivate));
+   intelScreen = (intelScreenPrivate *)CALLOC(sizeof(intelScreenPrivate));
    if (!intelScreen) {
       fprintf(stderr,"\nERROR!  Allocating private area failed\n");
       return GL_FALSE;