Merge branch 'master' into dtdocbook

cde/lib/DtSvc/DtEncap/spc-proto.c

@@ -1658,7 +1658,7 @@ int SPC_Query_Logfile(SPC_Channel_Ptr channel)
 {
   SPC_Connection_Ptr connection=channel->connection;
   protocol_request_ptr prot;
-  XeString junk1, junk2;
+  XeString junk1 = NULL, junk2 = NULL;
   
   SPC_Write_Protocol_Request(connection, channel, QUERY_LOGFILE);
   prot=SPC_Filter_Connection(connection, channel, LOGFILE_REPLY, TRUE);
@@ -1713,7 +1713,7 @@ SPC_Validate_User(XeString hostname,
 {
   XeString username = XeString_NULL;
   uid_t this_uid;
-  XeString proto_ver;
+  XeString proto_ver = NULL;
   XeString hostinfo;
   XeString path;
   protocol_request_ptr prot;

cde/lib/DtSvc/DtEncap/spc-xt.c

@@ -203,7 +203,7 @@ void SPC_XtAddInput(SPC_Channel_Ptr channel,
 		    SPC_Callback_Condition condition)
 /*-----------------------------------------------------------------------+*/
 {
-  SbInputId id;
+  SbInputId id = 0;
   
   switch(condition) {
     
@@ -224,8 +224,7 @@ void SPC_XtAddInput(SPC_Channel_Ptr channel,
     else
       id = (*SbAddException_hookfn)(fd, handler, channel);
     break;
-    
-  }
+   }
   
   *id_addr=SPC_AddInput(fd, condition, id);
 }

cde/lib/DtSvc/DtUtil1/ActionDb.c

@@ -1003,7 +1003,7 @@ _DtActionConverter(DtDtsDbField * fields,
 	char		bigBuf[_DtAct_MAX_BUF_SIZE];
 	char		*buf = bigBuf;
 	char		*fileName = _DtDbPathIdToString(pathId);
-	char		*actionType;
+	char		*actionType = NULL;
 
 	_DtSvcProcessLock();       
 	if (firstTime)

cde/lib/DtSvc/DtUtil1/ActionTt.c

@@ -885,7 +885,7 @@ TtRequestCallbackHandler(
     int argRepType;
     char *upttbuf;
     int upttbuflen, ivalue;
-    char *upVType, *upVType2;
+    char *upVType = NULL, *upVType2 = NULL;
 
 
     status = (Tt_status) tt_message_status(message);
@@ -1174,7 +1174,7 @@ InitiateTtRequest(
 	ActionRequest  *request )
 
 {
-    CallbackData *data;
+    CallbackData *data = NULL;
     ActionPtr action = request->clonedAction;
     tt_msgAttr * tt = &(action->u.tt_msg);
     int i;

cde/lib/DtSvc/DtUtil1/DbReader.c

@@ -961,7 +961,7 @@ ReadNextEntry(
    char *start;
    char *last;
    char *save;
-   char *error_buffer;
+   char *error_buffer = NULL;
    short startDef;
    char * errorName;
    char * version;

cde/lib/DtSvc/DtUtil1/Dts.c

@@ -1951,7 +1951,7 @@ DtDtsSetDataType(const char *filename, const char *datatype_in, const int overid
 	int		fd;
 	char		*dt;
 	int		size;
-	u_char		*buff;
+	u_char		*buff = NULL;
 	struct stat	file_stat;
 	char		*datatype = 0;
 

cde/lib/DtSvc/DtUtil1/SmComm.c

@@ -196,7 +196,7 @@ _DtSetSmState(
 	     Window smWindow,
 	     SmStateInfo *pSmStateInfo)
 {
-  int			propStatus;
+  int			propStatus = Success;
   PropDtSmStateInfo    propSmStateInfo;
   PropDtSmStateInfo   *pPropSmStateInfo;
   Atom                  xaDtSmStateInfo;

cde/lib/DtSvc/DtUtil2/ChkpntListen.c

@@ -67,7 +67,7 @@ _DtPerfChkpntListenInit(Display *display, Window parentwin)
 #endif
 {
     Time   timestamp = INVALID_TIME;
-    Window tmpwin;
+    Window tmpwin = 0;
     Bool   bsuccess = False;
 
     _DtSvcProcessLock();

cde/lib/DtSvc/DtUtil2/Hash.c

@@ -110,12 +110,12 @@ GetTableIndex(
 #endif /* NeedWidePrototypes */
 {
     DtHashEntry	*entries = tab->entries;
-    int		len, idx, i, rehash = 0;
+    int		len = 0, idx, i, rehash = 0;
     char 		c;
     Signature 		sig = 0;
     DtHashEntry	entry;
     String			s1, s2;
-    DtHashKey			compKey;
+    DtHashKey			compKey = NULL;
 
     if (tab->keyIsString) {
 	s1 = (String)key;

cde/lib/DtSvc/DtUtil2/SharedProcs.c

@@ -66,7 +66,7 @@
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
 #ifdef USE_XINERAMA
-#include <DtXinerama.h>
+#include <Dt/DtXinerama.h>
 #endif
 #include "SharedProcs.h"
 
@@ -209,7 +209,7 @@ _DtMessageDialog(
         int dialogType )
 
 {
-   Widget message;
+   Widget message = NULL;
    Widget widget;
    XmString message_string;
    XWindowAttributes attributes;

cde/lib/DtSvc/DtUtil2/addToRes.c

@@ -290,7 +290,7 @@ _DtGetEntries(
         int dosort )
 {
     char *line, *colon, *temp, *str, *temp2;
-    Entry entry;
+    Entry entry = { NULL, NULL, 0, False };
     int length;
     int lineno = 0;
 

cde/lib/DtSvc/Makefile.am

@@ -2,7 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
 
 lib_LTLIBRARIES = libDtSvc.la
 
+# in order to try to keep lib versions the same across platforms, (2.1.0)
+if BSD
 libDtSvc_la_LDFLAGS = -version-info 2:1:0
+else
+libDtSvc_la_LDFLAGS = -version-info 3:0:1
+endif
+
 
 # USe CPPFLAGS so it will apply to both C and C++ components
 libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \