Commit fb1fe519 authored by Claes Sjofors's avatar Claes Sjofors

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

parents 3b02d7b2 eb6beb2a
...@@ -161,7 +161,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1, ...@@ -161,7 +161,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
// Get prefix from file // Get prefix from file
strcpy( fname, "./orm/"); strcpy( fname, "./orm/");
s = strrchr( file_name, '/'); s = (char *)strrchr( file_name, '/');
if ( s) if ( s)
strcat( fname, s+1); strcat( fname, s+1);
s = strchr( fname, '_'); s = strchr( fname, '_');
...@@ -245,7 +245,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1, ...@@ -245,7 +245,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
// Get prefix from file // Get prefix from file
strcpy( fname, "./orm/"); strcpy( fname, "./orm/");
s = strrchr( file_name, '/'); s = (char *)strrchr( file_name, '/');
if ( s) if ( s)
strcat( fname, s+1); strcat( fname, s+1);
s = strchr( fname, '_'); s = strchr( fname, '_');
......
...@@ -258,7 +258,7 @@ char *Lng::translate( const char *text) ...@@ -258,7 +258,7 @@ char *Lng::translate( const char *text)
case 'B': { case 'B': {
char *s = strrchr( record->transl, ','); char *s = strrchr( record->transl, ',');
if ( s) { if ( s) {
char *t = strrchr( text, ','); const char *t = strrchr( text, ',');
if ( t) { if ( t) {
long int len = (unsigned long)s - (unsigned long)record->transl + 1; long int len = (unsigned long)s - (unsigned long)record->transl + 1;
strncpy( result, record->transl, len); strncpy( result, record->transl, len);
......
...@@ -280,6 +280,7 @@ log_thread (void *arg) ...@@ -280,6 +280,7 @@ log_thread (void *arg)
} }
} }
} }
return 0;
} }
......
...@@ -279,7 +279,7 @@ mvol_AnameToAttribute ( ...@@ -279,7 +279,7 @@ mvol_AnameToAttribute (
if ( i != pn->nAttribute - 1) { if ( i != pn->nAttribute - 1) {
if ( pn->hasIndex[i]) if ( pn->hasIndex[i])
offset += pn->index[i] * ap->adef->Info.Size / ap->adef->Info.Elements; 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; tid = ap->adef->TypeRef;
acp = hash_Search(sts, gdbroot->cid_ht, &ap->adef->TypeRef); acp = hash_Search(sts, gdbroot->cid_ht, &ap->adef->TypeRef);
......
...@@ -345,6 +345,8 @@ sect_Free ( ...@@ -345,6 +345,8 @@ sect_Free (
ker$delete(&lsts, shp->area); ker$delete(&lsts, shp->area);
#elif defined(OS_VMS) #elif defined(OS_VMS)
lsts = sys$deltva(shp->sectadr, NULL, 0); lsts = sys$deltva(shp->sectadr, NULL, 0);
#elif defined(OS_LINUX)
lsts = 1; /* TODO ? */
#endif #endif
if (ODD(lsts)) if (ODD(lsts))
......
...@@ -336,7 +336,7 @@ void Wb::wtt_open_volume( void *wttctx, wb_eType type, const char *filename, wow ...@@ -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); wb_volume *vol = new wb_volume(mem);
// Display filename i title, without path // Display filename i title, without path
char *name_p; const char *name_p;
if ( (name_p = strrchr( filename, '/'))) if ( (name_p = strrchr( filename, '/')))
name_p++; name_p++;
else else
......
...@@ -1012,7 +1012,7 @@ wb_dbms_info::wb_dbms_info(wb_dbms *db) : ...@@ -1012,7 +1012,7 @@ wb_dbms_info::wb_dbms_info(wb_dbms *db) :
void wb_dbms_info::get(wb_dbms_txn *txn) void wb_dbms_info::get(wb_dbms_txn *txn)
{ {
int index = 1; int index = 1;
int ret; int ret = 0;
wb_dbms_qe key(&index, sizeof(index)); wb_dbms_qe key(&index, sizeof(index));
wb_dbms_qe data(&m_volume, sizeof(m_volume)); wb_dbms_qe data(&m_volume, sizeof(m_volume));
......
...@@ -840,7 +840,7 @@ static pwr_tStatus gcg_get_build_host( ...@@ -840,7 +840,7 @@ static pwr_tStatus gcg_get_build_host(
int bufsize int bufsize
) )
{ {
int sts; int sts = GSX__SUCCESS;
char logname[32]; char logname[32];
if (os & pwr_mOpSys_PPC_LYNX) if (os & pwr_mOpSys_PPC_LYNX)
......
/* $ANTLR 2.7.6 (20060211): "wb_wbllexer.g" -> "wb_wbllexer.cpp"$ */ /* $ANTLR 2.7.6 (20060211): "wb_wbllexer.g" -> "wb_wbllexer.cpp"$ */
#include <stdio.h>
#include "wb_wbllexer.hpp" #include "wb_wbllexer.hpp"
#include <antlr/CharBuffer.hpp> #include <antlr/CharBuffer.hpp>
#include <antlr/TokenStreamException.hpp> #include <antlr/TokenStreamException.hpp>
......
...@@ -476,7 +476,7 @@ static int wnav_help_func( void *client_data, ...@@ -476,7 +476,7 @@ static int wnav_help_func( void *client_data,
char bookmark_str[80]; char bookmark_str[80];
char key[80]; char key[80];
int pop; int pop;
int strict; int strict = 0;
if ( ODD( dcli_get_qualifier( "/INDEX", file_str, sizeof(file_str)))) if ( ODD( dcli_get_qualifier( "/INDEX", file_str, sizeof(file_str))))
...@@ -4067,7 +4067,7 @@ static int wnav_create_func( void *client_data, ...@@ -4067,7 +4067,7 @@ static int wnav_create_func( void *client_data,
char from_str[120]; char from_str[120];
char *fromstr_ptr; char *fromstr_ptr;
int sts; int sts;
int templ; int templ = 0;
if ( !wnav->editmode) { if ( !wnav->editmode) {
wnav->message('E', "Not in edit mode"); wnav->message('E', "Not in edit mode");
......
...@@ -1568,11 +1568,13 @@ void GeCurveData::scale( int axis_type, int value_type, ...@@ -1568,11 +1568,13 @@ void GeCurveData::scale( int axis_type, int value_type,
break; break;
case curve_eTimeFormat_HourMinute: case curve_eTimeFormat_HourMinute:
// Hour and minute format // Hour and minute format
format_int = abs(n) + 1;
strcpy( format, "%2t"); strcpy( format, "%2t");
*axis_width = 0.65 * format_int + 0.4; *axis_width = 0.65 * format_int + 0.4;
break; break;
case curve_eTimeFormat_DayHour: case curve_eTimeFormat_DayHour:
// Days and hour format // Days and hour format
format_int = abs(n) + 1;
strcpy( format, "%3t"); strcpy( format, "%3t");
*axis_width = 0.65 * format_int + 0.4; *axis_width = 0.65 * format_int + 0.4;
break; break;
......
...@@ -64,7 +64,7 @@ static char *gname( const char *name) ...@@ -64,7 +64,7 @@ static char *gname( const char *name)
static char n[80]; static char n[80];
char *s; char *s;
if ( (s = strrchr( name, '/'))) if ( (s = (char *)strrchr( name, '/')))
strncpy( n, s+1, sizeof(n)); strncpy( n, s+1, sizeof(n));
else else
strncpy( n, name, sizeof(n)); strncpy( n, name, sizeof(n));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment