Merge pull request #12 from ana/master

A couple of GCC fixes

Author: hestela

psm_diags.c

@@ -281,10 +281,11 @@ memcpy_check_size (memcpy_fn_t fn, int *p, int *f, size_t n)
   if (USE_MALLOC) {
     src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
     dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
-    if (src == NULL || dst == NULL) 
+    if (src == NULL || dst == NULL) {
       if (src) psmi_free(src);
       if (dst) psmi_free(dst);
       return -1;
+	}
   }
   else {
     void *src_p = NULL, *dst_p = NULL;

ptl_am/am_reqrep_shmem.c

@@ -542,7 +542,7 @@ psmi_shm_attach(psm_ep_t ep, int *shmidx_o)
 
 	ep->amsh_dirpage->is_init = 1;
 	_IPATH_PRDBG("Mapped and initialized shm object control page at %p,"
-                    "size=%ld, kcopy minor is %d (mode=%s)\n", mapptr,
+                    "size=%zu, kcopy minor is %d (mode=%s)\n", mapptr,
 		    segsz, kcopy_minor,
 		    psmi_kassist_getmode(ep->psmi_kassist_mode));
     }