Show
Ignore:
Timestamp:
06/18/10 20:02:50 (3 years ago)
Author:
nlmills
Message:

initial merge with Orange-Branch. much will be broken

Location:
branches/cu-security-branch
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch

    • Property svn:ignore

      •  

        old new  
        33aclocal.m4 
        44autom4te.cache 
        5 config.status 
        6 Makefile 
        7 pvfs2-config.h 
        8 module.mk 

  • branches/cu-security-branch/src/common/misc

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/common/misc/pint-mem.c

    r7941 r8397  
    88#include <errno.h> 
    99#include <stdlib.h> 
     10#include <string.h> 
    1011#ifdef HAVE_MALLOC_H 
    1112#include <malloc.h> 
    1213#endif 
    1314 
    14 #include "pint-mem.h" 
     15/* prototype definitions */ 
     16inline void* PINT_mem_aligned_alloc(size_t size, size_t alignment); 
     17inline void PINT_mem_aligned_free(void *ptr); 
    1518 
    1619/* PINT_mem_aligned_alloc() 
    … …  
    3336        return NULL; 
    3437    } 
     38    memset(ptr, 0, size); 
    3539    return ptr; 
    3640}