Skip to content

Commit

Permalink
[#193] Fix various GTM-E- occurrences to be YDB-E- since ydb_msgprefi…
Browse files Browse the repository at this point in the history
…x default is YDB in r1.20
  • Loading branch information
nars1 committed Apr 6, 2018
1 parent e3c04d2 commit 3754878
Show file tree
Hide file tree
Showing 23 changed files with 60 additions and 39 deletions.
2 changes: 1 addition & 1 deletion sr_armv7l/GTMDefinedTypesInitDebug.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define YottaDB structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_armv7l/GTMDefinedTypesInitRelease.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define YottaDB structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_i386/GTMDefinedTypesInitDebug.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define GTM structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_i386/GTMDefinedTypesInitRelease.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define GTM structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_port/dsewrap.mpt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ parsefhead(output,active)
. if ($test=0)&($length(line(i))=0) write !
. set line=$tr($$FUNC^%TRIM(line(i)),$c(10,13),"")
. quit:($length(line)=0)
. if line["%GTM-E-" set error=1 if $data(%DSEWRAP("debug")) set debug(debug,"error")=line
. if line["%YDB-E-" set error=1 if $data(%DSEWRAP("debug")) set debug(debug,"error")=line
. if line?1"DSE>".E kill region,file quit ; DSE prompt means reset header information
. quit:line["Error: already in region: " ; ignore already in region error
. if line?1"File"1." ".E set fcnt=$length(line," "),file=$piece(line," ",fcnt) quit
Expand Down
2 changes: 1 addition & 1 deletion sr_port/gdeinitsz.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gdeinit.m to define YottaDB structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_port/gvcst_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ void gvcst_init(gd_region *reg, gd_addr *addr)
INIT_DEFERRED_DB_ENCRYPTION_IF_NEEDED(reg, csa, csd);
/* gds_rundown if invoked from now on will take care of cleaning up the shared memory segment */
/* The below code, until the ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state), can do mallocs which in turn
* can issue a GTM-E-MEMORY error which would invoke rts_error. Hence these have to be done AFTER the
* can issue a YDB-E-MEMORY error which would invoke rts_error. Hence these have to be done AFTER the
* DBG_MARK_RTS_ERROR_USABLE call. Since these are only private memory initializations, it is safe to
* do these after reg->open is set. Any rts_errors from now on still do the needful cleanup of shared memory in
* gds_rundown since reg->open is already TRUE.
Expand Down
7 changes: 5 additions & 2 deletions sr_port/mu_int_getkey.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/****************************************************************
* *
* Copyright 2001, 2013 Fidelity Information Services, Inc *
* Copyright 2001, 2013 Fidelity Information Services, Inc *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
Expand Down Expand Up @@ -58,7 +61,7 @@ int mu_int_getkey(unsigned char *key_buff, int keylen)
if (0 == keylen)
{ /* null subscript specified. signal an error */
UNIX_ONLY(assert(FALSE)); /* Unix should not reach here at all. cli_parse() would have errored out */
util_out_print("%GTM-E-CLIERR, Unrecognized option : SUBSCRIPT, value expected but not found", TRUE);
util_out_print("%YDB-E-CLIERR, Unrecognized option : SUBSCRIPT, value expected but not found", TRUE);
CLNUP_AND_RETURN_FALSE;
}
top = src + keylen;
Expand Down
2 changes: 1 addition & 1 deletion sr_port/secshr_db_clnup.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
if (NULL != first_sgm_info)
{
si = csa->sgm_info_ptr;
/* Note that it is possible "si" is NULL in case of a GTM-E-MEMORY error in gvcst_init.
/* Note that it is possible "si" is NULL in case of a YDB-E-MEMORY error in gvcst_init.
* Handle that accordingly in the code below.
*/
/* Since the kill process cannot be completed, we need to decerement KIP count
Expand Down
5 changes: 4 additions & 1 deletion sr_port/updproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2001-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -1125,7 +1128,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
/* Scan the global for two reasons :
* (a) Need to setup gv_currkey->prev as update process can invoke triggers which
* could use naked references which relies on gv_currkey->prev being properly set
* (b) Set gv_some_subsc_null and gv_last_subsc_null accordingly to issue GTM-E-NULSUSBC
* (b) Set gv_some_subsc_null and gv_last_subsc_null accordingly to issue YDB-E-NULSUSBC
* if needed.
*/
key = (char *)(gv_currkey->base);
Expand Down
7 changes: 5 additions & 2 deletions sr_port/v5cbsu.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; ;
; Copyright 2005, 2010 Fidelity Information Services, Inc ;
; Copyright 2005, 2010 Fidelity Information Services, Inc ;
; ;
; Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. ;
; All rights reserved. ;
; ;
; This source code contains the intellectual property ;
; of its copyright holder(s), and is made available ;
Expand Down Expand Up @@ -45,7 +48,7 @@ Do doopen(.p1outfile,readflg)
D readp1hd
If p1tag'=p1tagread Do Quit
. Use $P
. Write "%GTM-E-DBCBADFILE, Source file ",p1outfile
. Write "%YDB-E-DBCBADFILE, Source file ",p1outfile
. Write " does not appear to have been generated by DBCERTIFY SCAN - rerun SCAN or specify correct file",!
set quitnow=0
If 'dumpmode&'fix512mode Do If quitnow Quit
Expand Down
2 changes: 1 addition & 1 deletion sr_port/wbox_test_init.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ typedef enum {
WBTEST_HOLD_GTMSOURCE_SRV_LATCH, /* 99 : Hold the source server latch until rollback process issues a SIGCONT */
WBTEST_KILL_ROLLBACK, /* 100 : Kill in the middle of rollback */
WBTEST_INFO_HUB_SEND_ZMESS, /* 101 : Print messages triggered via ZMESSAGE to the syslog */
WBTEST_SKIP_CORE_FOR_MEMORY_ERROR, /* 102 : Do not generate core file in case of GTM-E-MEMORY fatal error */
WBTEST_SKIP_CORE_FOR_MEMORY_ERROR, /* 102 : Do not generate core file in case of YDB-E-MEMORY fatal error */
WBTEST_EXTFILTER_INDUCE_ERROR, /* 103 : Do not assert in case of external filter error (test induces that) */
WBTEST_BADEXEC_UPDATE_PROCESS, /* 104 : Prevent the update process from EXECing */
WBTEST_BADEXEC_HELPER_PROCESS, /* 105 : Prevent the helper processes from EXECing */
Expand Down
2 changes: 1 addition & 1 deletion sr_unix/comlist.csh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if ( "$version" =~ *ibm-aix* ) then
unsetenv gtm_icu_version
endif

# Unset gtm_custom_errors to prevent some errors, especially %GTM-E-FTOKERR if $gtm_repl_instance is set in the environment
# Unset gtm_custom_errors to prevent some errors, especially %YDB-E-FTOKERR if $gtm_repl_instance is set in the environment
unsetenv gtm_custom_errors

@ comlist_status = 0
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/gtm_fork_n_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2001-2016 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -202,7 +205,7 @@ void gtm_fork_n_core(void)
if (-1 == waitrc)
{ /* If got error from waitpid, core may or may not have been taken. Assume worst & don't set flag */
errno = save_errno;
PERROR("GTM-E-FORKCOREWAIT");
PERROR("YDB-E-FORKCOREWAIT");
} else
created_core = TRUE;
} else
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/gtm_tls_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2013-2015 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -45,7 +48,7 @@
#define GTM_PASSPHRASE_MAX 512 /* obfuscated */
#define GTM_PASSPHRASE_MAX_ASCII (GTM_PASSPHRASE_MAX / 2)
#elif GTM_PASSPHRASE_MAX != 512
#error "GTM-E-GTMTLSINTERFACE different values for GTM_PASSPHRASE_MAX"
#error "YDB-E-GTMTLSINTERFACE different values for GTM_PASSPHRASE_MAX"
#endif

/* Note these flags may be in either the ctx or ssl structures but not all
Expand Down
2 changes: 1 addition & 1 deletion sr_unix/gtm_tls_loadlibrary.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int gtm_tls_loadlibrary()

if(!ydb_dist_ok_to_use)
{
SNPRINTF(dl_err, MAX_ERRSTR_LEN, "%%GTM-E-YDBDISTUNVERIF, Environment variable $ydb_dist (%s) "
SNPRINTF(dl_err, MAX_ERRSTR_LEN, "%%YDB-E-YDBDISTUNVERIF, Environment variable $ydb_dist (%s) "
"could not be verified against the executables path", ydb_dist);
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion sr_unix/gtmcrypt_entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ uint4 gtmcrypt_entry()

if(!ydb_dist_ok_to_use)
{
SNPRINTF(dl_err, MAX_ERRSTR_LEN, "%%GTM-E-YDBDISTUNVERIF, Environment variable $ydb_dist (%s) "
SNPRINTF(dl_err, MAX_ERRSTR_LEN, "%%YDB-E-YDBDISTUNVERIF, Environment variable $ydb_dist (%s) "
"could not be verified against the executables path", ydb_dist);
return ERR_CRYPTDLNOOPEN;
}
Expand Down
28 changes: 14 additions & 14 deletions sr_unix/gtmsecshr_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,37 +92,37 @@ extern char **environ;
* in the syslog.
*/
#define ERR_SECSHRCLEARENVFAILED \
"%%GTM-E-SECSHRCLEARENVFAILED, clearenv failed. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRCLEARENVFAILED, clearenv failed. gtmsecshr will not be started\n"
#define ERR_SECSHRCHDIRFAILED1 \
"%%GTM-E-SECSHRCHDIRFAILED1, chdir failed on %s, errno %d. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRCHDIRFAILED1, chdir failed on %s, errno %d. gtmsecshr will not be started\n"
#define ERR_SECSHRCHDIRFAILED2 \
"%%GTM-W-SECSHRCHDIRFAILED2, chdir failed on %s, errno %d. gtmsecshr will be started with GMT timezone\n"
#define ERR_SECSHREXECLFAILED \
"%%GTM-E-SECSHREXECLFAILED, execl of %s failed\n"
"%%YDB-E-SECSHREXECLFAILED, execl of %s failed\n"
#define ERR_SECSHRYDBDIST2LONG \
"%%GTM-E-SECSHRYDBDIST2LONG, ydb_dist env var too long. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRYDBDIST2LONG, ydb_dist env var too long. gtmsecshr will not be started\n"
#define ERR_SECSHRGTMTMP2LONG \
"%%GTM-E-SECSHRGTMTMP2LONG, gtm_tmp env var too long. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRGTMTMP2LONG, gtm_tmp env var too long. gtmsecshr will not be started\n"
#define ERR_SECSHRNOYDBDIST \
"%%GTM-E-SECSHRNOYDBDIST, ydb_dist env var does not exist. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRNOYDBDIST, ydb_dist env var does not exist. gtmsecshr will not be started\n"
#define ERR_SECSHRNOTOWNEDBYROOT \
"%%GTM-E-SECSHRNOTOWNEDBYROOT, %s not owned by root. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRNOTOWNEDBYROOT, %s not owned by root. gtmsecshr will not be started\n"
#define ERR_SECSHRNOTSETUID \
"%%GTM-E-SECSHRNOTSETUID, %s not set-uid. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRNOTSETUID, %s not set-uid. gtmsecshr will not be started\n"
#define ERR_SECSHRPERMINCRCT \
"%%GTM-E-SECSHRPERMINCRCT, %s permissions incorrect (%04o). gtmsecshr will not be started\n"
"%%YDB-E-SECSHRPERMINCRCT, %s permissions incorrect (%04o). gtmsecshr will not be started\n"
#define ERR_SECSHRSETYDBDISTFAILED \
"%%GTM-E-SECSHRSETYDBDISTFAILED, setenv for ydb_dist failed. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRSETYDBDISTFAILED, setenv for ydb_dist failed. gtmsecshr will not be started\n"
#define ERR_SECSHRSETGTMTMPFAILED \
"%%GTM-E-SECSHRSETGTMTMPFAILED, setenv for gtm_tmp failed. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRSETGTMTMPFAILED, setenv for gtm_tmp failed. gtmsecshr will not be started\n"
#define ERR_SECSHRSETUIDFAILED \
"%%GTM-E-SECSHRSETUIDFAILED, setuid failed. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRSETUIDFAILED, setuid failed. gtmsecshr will not be started\n"
#define ERR_SECSHRSTATFAILED \
"%%GTM-E-SECSHRSTATFAILED, stat failed on %s, errno %d. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRSTATFAILED, stat failed on %s, errno %d. gtmsecshr will not be started\n"
#define ERR_SECSHRTZFAIL \
"%%GTM-W-SECSHRTZFAIL, %s %d. gtmsecshr will start with TZ set to GMT\n"
#define ERR_SECSHRWRITABLE \
"%%GTM-E-SECSHRWRITABLE, %s writable. gtmsecshr will not be started\n"
"%%YDB-E-SECSHRWRITABLE, %s writable. gtmsecshr will not be started\n"

/*
Make sure these are synced with the above. We need this comment for the InfoHub tools to generate message
Expand Down
4 changes: 2 additions & 2 deletions sr_unix/peekbyname.mpt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
; This argument overrides the automatic format detection by the %PEEKBYNAME utility.

%PEEKBYNAME(field,regindex,format)
if '$quit write "GTM-E-EXTRINSIC Use $$ rather than DO to invoke ",$text(+0) quit
if '$quit write "YDB-E-EXTRINSIC Use $$ rather than DO to invoke ",$text(+0) quit
new anindexval,aregname,digits,etrap,first,ishexnum,land,length,mnemonicandreg,offset,pattern,rest,type,typeindex
new dim,ret,idx,off
set etrap=$etrap
Expand Down Expand Up @@ -115,7 +115,7 @@ error(err,first,args)
if ("PARMREQ"=err)!("INVALID"=err) set args=""""_first_""":"""_args_""""
else if ("NOPARM"=err)!("UNSUPSTRUCT"=err)!("UNSUPTYPE"=err) set args=""""_first_""""
else set args=""""""
set $etrap="if $zstatus[""UNKNOWN"" set $zstatus=""%GTM-E-""_str_x zgoto land" ; in case of older versions
set $etrap="if $zstatus[""UNKNOWN"" set $zstatus=""%YDB-E-""_str_x zgoto land" ; in case of older versions
xecute "zmessage "_$translate(str,",",":")_args ; XECUTE because indirection exploded in older versions
zgoto land

Expand Down
5 changes: 4 additions & 1 deletion sr_unix/pinentry.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
; Copyright (c) 2010-2017 Fidelity National Information ;
; Services, Inc. and/or its subsidiaries. All rights reserved. ;
; ;
; Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. ;
; All rights reserved. ;
; ;
; This source code contains the intellectual property ;
; of its copyright holder(s), and is made available ;
; under a license. If you do not know the terms of ;
Expand Down Expand Up @@ -49,7 +52,7 @@
error kill
new $etrap set $etrap="set $etrap=""zgoto 0"" zhalt +$zstatus"
new i,info
set errmsg="%GTM-E-PINENTRYERR, Custom pinentry program failure. "_$zstatus_"; from "_$zdirectory
set errmsg="%YDB-E-PINENTRYERR, Custom pinentry program failure. "_$zstatus_"; from "_$zdirectory
if $zsyslog(errmsg)
set pinlog=$ztrnlnm("gtm_pinentry_log")
if $zlength(pinlog) do
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/set_library_path.csh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Copyright (c) 2010-2016 Fidelity National Information #
# Services, Inc. and/or its subsidiaries. All rights reserved. #
# #
# Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. #
# All rights reserved. #
# #
# This source code contains the intellectual property #
# of its copyright holder(s), and is made available #
# under a license. If you do not know the terms of #
Expand Down Expand Up @@ -35,7 +38,7 @@ else
# Redhat/SuSE way: /lib 32bit
# /lib64 64bit
if !($?gtm_inc) then
echo "GTM-E-ERROR : gtm_inc not defined!"
echo "YDB-E-ERROR : gtm_inc not defined!"
exit
endif

Expand Down
2 changes: 1 addition & 1 deletion sr_x86_64/GTMDefinedTypesInitDebug.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define YottaDB structure fields
Expand Down
2 changes: 1 addition & 1 deletion sr_x86_64/GTMDefinedTypesInitRelease.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
;
; Note this file should not be manually invoked
;
Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
Write "This routine (",$TEXT(+0),") should not be manually invoked",!
Quit
;
; Entry point used by gtmpcat and others to define YottaDB structure fields
Expand Down

0 comments on commit 3754878

Please sign in to comment.