Fixing a bunch of warnings

security/psm/lib/client/cmtcert.c

@@ -674,7 +674,7 @@ CMTStatus CMT_CompareForRedirect(PCMT_CONTROL control, CMTItem *status1,
                                  CMTItem *status2, CMUint32 *res)
 {
     RedirectCompareRequest request;
-    CMTItem message = { 0 };
+    CMTItem message = { 0, NULL, 0 };
     SingleNumMessage reply;
 
     if (status1 == NULL || status2 == NULL || res == NULL) {
@@ -717,7 +717,7 @@ CMT_DecodeAndAddCRL(PCMT_CONTROL control, unsigned char *derCrl,
 {
     DecodeAndAddCRLRequest request;
     SingleNumMessage reply;
-    CMTItem message = { 0 };
+    CMTItem message = { 0, NULL, 0 };
 
     if (*errMess) *errMess = NULL;
     request.derCrl.data = derCrl;
@@ -815,7 +815,7 @@ CMTStatus CMT_SCAddTempCertToPermDB(PCMT_CONTROL control, CMTItem* certKey,
                                     char* trustStr, char* nickname)
 {
     SCAddTempCertToPermDBRequest request;
-    CMTItem message = {0};
+    CMTItem message = {0, NULL, 0};
     SingleNumMessage reply;
 
     if ((certKey == NULL) || (trustStr == NULL)) {
@@ -854,7 +854,7 @@ CMTStatus CMT_SCDeletePermCerts(PCMT_CONTROL control, CMTItem* certKey,
                                 CMBool deleteAll)
 {
     SCDeletePermCertsRequest request;
-    CMTItem message = {0};
+    CMTItem message = {0, NULL, 0};
     SingleNumMessage reply;
 
     if (certKey == NULL) {

security/psm/lib/client/cmtcmn.h

@@ -1957,9 +1957,9 @@ char* CMT_SCGetCertPropTrust(PCMT_CONTROL control, CMTItem* certKey);
 char* CMT_SCGetCertPropSerialNumber(PCMT_CONTROL control, CMTItem* certKey);
 char* CMT_SCGetCertPropIssuerName(PCMT_CONTROL control, CMTItem* certKey);
 CMTStatus CMT_SCGetCertPropTimeNotBefore(PCMT_CONTROL control, 
-                                         CMTItem* certKey, CMTime* time);
+                                         CMTItem* certKey, CMTime* beforetime);
 CMTStatus CMT_SCGetCertPropTimeNotAfter(PCMT_CONTROL control, 
-                                        CMTItem* certKey, CMTime* time);
+                                        CMTItem* certKey, CMTime* aftertime);
 CMTItem* CMT_SCGetCertPropIssuerKey(PCMT_CONTROL control, CMTItem* certKey);
 CMTItem* CMT_SCGetCertPropSubjectNext(PCMT_CONTROL control, CMTItem* certKey);
 CMTItem* CMT_SCGetCertPropSubjectPrev(PCMT_CONTROL control, CMTItem* certKey);

security/psm/lib/client/cmtevent.c

@@ -223,7 +223,7 @@ PCMT_EVENT CMT_GetNextEventHandler(PCMT_CONTROL control, PCMT_EVENT e)
 void CMT_ProcessEvent(PCMT_CONTROL cm_control)
 {
     CMTSocket sock; 
-    CMTItem eventData={ 0 };
+    CMTItem eventData={ 0, NULL, 0 };
 
     /* Get the control socket */
     sock = cm_control->sock;
@@ -269,7 +269,7 @@ void
 CMT_PromptUser(PCMT_CONTROL cm_control, CMTItem *eventData)
 {
     char *promptReply  = NULL;
-    CMTItem   response={ 0 };
+    CMTItem   response={ 0, NULL, 0 };
     PromptRequest request;
     PromptReply reply;
     void * clientContext;
@@ -317,7 +317,7 @@ CMT_PromptUser(PCMT_CONTROL cm_control, CMTItem *eventData)
 void CMT_GetFilePath(PCMT_CONTROL cm_control, CMTItem * eventData)
 {
     char *fileName=NULL;
-    CMTItem response = { 0 };
+    CMTItem response = { 0, NULL, 0 };
     FilePathRequest request;
     FilePathReply reply;
 

security/psm/lib/client/cmthash.c

@@ -173,7 +173,7 @@ CMTStatus CMT_HASH_End(PCMT_CONTROL control, CMUint32 connectionID,
                        unsigned char * result, CMUint32 * resultlen, 
                        CMUint32 maxLen)
 {
-    CMTItem hash = { 0 };
+    CMTItem hash = { 0, NULL, 0 };
 
     /* Do some parameter checking */
     if (!control || !result || !resultlen) {

security/psm/lib/client/cmtutils.c

@@ -345,12 +345,12 @@ loser:
 CMTStatus CMT_ReceiveMessage(PCMT_CONTROL control, CMTItem * response)
 {
     CMTMessageHeader header;
-    CMUint32 read, rv;
+    CMUint32 numread, rv;
 
     /* Get the obscured message header */
-    read = CMT_ReadThisMany(control, control->sock, 
+    numread = CMT_ReadThisMany(control, control->sock, 
                             (void *)&header, sizeof(CMTMessageHeader));
-    if (read != sizeof(CMTMessageHeader)) {
+    if (numread != sizeof(CMTMessageHeader)) {
         goto loser;
     }
 
@@ -361,9 +361,9 @@ CMTStatus CMT_ReceiveMessage(PCMT_CONTROL control, CMTItem * response)
         goto loser;
     }
 
-    read = CMT_ReadThisMany(control, control->sock, 
+    numread = CMT_ReadThisMany(control, control->sock, 
                             (void *)(response->data), response->len); 
-    if (read != response->len) {
+    if (numread != response->len) {
         goto loser;
     }
 
@@ -402,7 +402,7 @@ CMUint32 CMT_WriteThisMany(PCMT_CONTROL control, CMTSocket sock,
 	CMUint32 total = 0;
   
 	while (total < thisMany) {
-		CMUint32 got;
+		CMInt32 got;
 		got = control->sockFuncs.send(sock, (void*)((char*)buffer+total), 
                                       thisMany-total);
 		if (got < 0) {

security/psm/lib/client/cmtutils.h

@@ -60,7 +60,7 @@ CMTItem* CMT_ConstructMessage(CMUint32 type, CMUint32 length);
 void CMT_FreeMessage(CMTItem * p);
 CMTStatus CMT_AddDataConnection(PCMT_CONTROL control, CMTSocket sock, CMUint32 connectionID);
 CMTStatus CMT_GetDataConnectionID(PCMT_CONTROL control, CMTSocket sock, CMUint32 * connectionID);
-CMTStatus CMT_GetDataSocket(PCMT_CONTROL control, CMUint32 connectionID, CMTSocket * socket);
+CMTStatus CMT_GetDataSocket(PCMT_CONTROL control, CMUint32 connectionID, CMTSocket * sock);
 CMTStatus CMT_CloseDataConnection(PCMT_CONTROL control, CMUint32 connectionID);
 CMTStatus CMT_SetPrivate(PCMT_CONTROL control, CMUint32 connectionID,
 			 CMTPrivate *cmtpriv);