Merge branch 'master' of pwrcvs:/data1/git/pwr

src/exe/co_convert/src/cnv_xtthelptohtml.cpp

@@ -161,7 +161,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
 
 	  // Get prefix from file
 	  strcpy( fname, "./orm/");
-	  s = strrchr( file_name, '/');
+	  s = (char *)strrchr( file_name, '/');
 	  if ( s)
 	    strcat( fname, s+1);
 	  s = strchr( fname, '_');
@@ -245,7 +245,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
 
 	  // Get prefix from file
 	  strcpy( fname, "./orm/");
-	  s = strrchr( file_name, '/');
+	  s = (char *)strrchr( file_name, '/');
 	  if ( s)
 	    strcat( fname, s+1);
 	  s = strchr( fname, '_');

src/lib/co/src/co_lng.cpp

@@ -258,7 +258,7 @@ char *Lng::translate( const char *text)
     case 'B': {
       char *s = strrchr( record->transl, ',');
       if ( s) {
-	char *t = strrchr( text, ',');
+	const char *t = strrchr( text, ',');
 	if ( t) {
 	  long int len = (unsigned long)s - (unsigned long)record->transl + 1;
 	  strncpy( result, record->transl, len);

src/lib/rt/src/os_linux/rt_errl.c

@@ -280,6 +280,7 @@ log_thread (void *arg)
       }
     }
   }
+  return 0;
 }
 
 

src/lib/rt/src/rt_mvol.c

@@ -279,7 +279,7 @@ mvol_AnameToAttribute (
       if ( i != pn->nAttribute - 1) {
 	if ( pn->hasIndex[i])
 	  offset += pn->index[i] * ap->adef->Info.Size / ap->adef->Info.Elements;
-	if ( !ap->adef->Info.Flags & PWR_MASK_CLASS) pwr_Return(NULL, sts, GDH__NOSUCHCLASS);
+	if ( !(ap->adef->Info.Flags & PWR_MASK_CLASS)) pwr_Return(NULL, sts, GDH__NOSUCHCLASS);
 
         tid = ap->adef->TypeRef;
 	acp = hash_Search(sts, gdbroot->cid_ht, &ap->adef->TypeRef);

src/lib/rt/src/rt_sect.c

@@ -345,6 +345,8 @@ sect_Free (
   ker$delete(&lsts, shp->area);
 #elif defined(OS_VMS)
   lsts = sys$deltva(shp->sectadr, NULL, 0);
+#elif defined(OS_LINUX)
+  lsts = 1; /* TODO ? */
 #endif
 
   if (ODD(lsts))

wb/exe/wb/src/wb_main.cpp

@@ -336,7 +336,7 @@ void Wb::wtt_open_volume( void *wttctx, wb_eType type, const char *filename, wow
 	wb_volume *vol = new wb_volume(mem);
 
 	// Display filename i title, without path
-        char *name_p;
+        const char *name_p;
 	if ( (name_p = strrchr( filename, '/')))
 	  name_p++;
 	else

wb/lib/wb/src/wb_dbms.cpp

@@ -1012,7 +1012,7 @@ wb_dbms_info::wb_dbms_info(wb_dbms *db) :
 void wb_dbms_info::get(wb_dbms_txn *txn)
 {
   int index = 1;
-  int ret;
+  int ret = 0;
   wb_dbms_qe key(&index, sizeof(index));
   wb_dbms_qe data(&m_volume, sizeof(m_volume));
 

wb/lib/wb/src/wb_gcg.cpp

@@ -840,7 +840,7 @@ static pwr_tStatus gcg_get_build_host(
     int bufsize
 )
 {
-	int sts;
+	int sts = GSX__SUCCESS;
 	char logname[32];
 
 	if (os & pwr_mOpSys_PPC_LYNX)

wb/lib/wb/src/wb_wbllexer.cpp

 /* $ANTLR 2.7.6 (20060211): "wb_wbllexer.g" -> "wb_wbllexer.cpp"$ */
+#include <stdio.h>
 #include "wb_wbllexer.hpp"
 #include <antlr/CharBuffer.hpp>
 #include <antlr/TokenStreamException.hpp>

wb/lib/wb/src/wb_wnav_command.cpp

@@ -476,7 +476,7 @@ static int	wnav_help_func(		void		*client_data,
   char	bookmark_str[80];
   char	key[80];
   int	pop;
-  int   strict;
+  int   strict = 0;
 	
 
   if ( ODD( dcli_get_qualifier( "/INDEX", file_str, sizeof(file_str))))
@@ -4067,7 +4067,7 @@ static int	wnav_create_func( void		*client_data,
     char		from_str[120];
     char		*fromstr_ptr;
     int			sts;
-    int			templ;
+    int			templ = 0;
 
     if ( !wnav->editmode) {
       wnav->message('E', "Not in edit mode");

xtt/lib/ge/src/ge_curve.cpp

@@ -1568,11 +1568,13 @@ void GeCurveData::scale( int axis_type, int value_type,
     break;
   case curve_eTimeFormat_HourMinute:
     // Hour and minute format
+    format_int = abs(n) + 1;
     strcpy( format, "%2t");
     *axis_width = 0.65 * format_int + 0.4;
     break;
   case curve_eTimeFormat_DayHour:
     // Days and hour format
+    format_int = abs(n) + 1;
     strcpy( format, "%3t");
     *axis_width = 0.65 * format_int + 0.4;
     break;

xtt/lib/ge/src/ge_graph_journal.cpp

@@ -64,7 +64,7 @@ static char *gname( const char *name)
   static char n[80];
   char *s;
 
-  if ( (s = strrchr( name, '/')))
+  if ( (s = (char *)strrchr( name, '/')))
     strncpy( n, s+1, sizeof(n));
   else
     strncpy( n, name, sizeof(n));