IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1716


Ignore:
Timestamp:
Sep 7, 2004, 2:19:21 PM (22 years ago)
Author:
desonia
Message:

changed more PS_ERRORTEXT macros to use the filename of the placed used instead of function name.

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/sys/psLogMsg.c

    r1713 r1716  
    1212 *  @author George Gusciora, MHPCC
    1313 *
    14  *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-09-08 00:09:06 $
     14 *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-09-08 00:19:21 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    114114    if (sscanf(dest, "%4s:%256s", protocol, location) < 2) {
    115115        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    116                    PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED,
     116                   PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED,
    117117                   dest);
    118118        return false;
     
    135135        }
    136136        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    137                    PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID,
     137                   PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID,
    138138                   location);
    139139        return 1;
     
    143143        if (file == NULL) {
    144144            psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_IO,
    145                        PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED,
     145                       PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
    146146                       location);
    147147            return false;
     
    155155
    156156    psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    157                PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL,
     157               PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL,
    158158               protocol);
    159159    return false;
     
    219219        default:
    220220            psErrorMsg(ERRORNAME_PREFIX "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
    221                        PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY, *ptr);
     221                       PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
    222222            break;
    223223        }
  • trunk/psLib/src/sysUtils/psLogMsg.c

    r1713 r1716  
    1212 *  @author George Gusciora, MHPCC
    1313 *
    14  *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-09-08 00:09:06 $
     14 *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-09-08 00:19:21 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    114114    if (sscanf(dest, "%4s:%256s", protocol, location) < 2) {
    115115        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    116                    PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED,
     116                   PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED,
    117117                   dest);
    118118        return false;
     
    135135        }
    136136        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    137                    PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID,
     137                   PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID,
    138138                   location);
    139139        return 1;
     
    143143        if (file == NULL) {
    144144            psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_IO,
    145                        PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED,
     145                       PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
    146146                       location);
    147147            return false;
     
    155155
    156156    psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
    157                PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL,
     157               PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL,
    158158               protocol);
    159159    return false;
     
    219219        default:
    220220            psErrorMsg(ERRORNAME_PREFIX "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
    221                        PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY, *ptr);
     221                       PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
    222222            break;
    223223        }
  • trunk/psLib/src/sysUtils/psSysUtilsErrors.dat

    r1715 r1716  
    99# Error Messages from psLogMsg.c:
    1010#
    11 psLogSetDestination_DESTINATION_MALFORMED      The specified destination, %s, is malformed.
    12 psLogSetDestination_DEST_LOCATION_INVALID      The location, %s, for protocol 'dest' is invalid.
    13 psLogSetDestination_OPEN_FILE_FAILED           Could not open file '%s' for output.
    14 psLogSetDestination_UNSUPPORTED_PROTOCOL       Do not know how to handle the protocol '%s'.
    15 psLogSetFormat_UNKNOWN_KEY                     Unknown logging keyword %c.
     11psLogMsg_DESTINATION_MALFORMED         The specified destination, %s, is malformed.
     12psLogMsg_DEST_LOCATION_INVALID         The location, %s, for protocol 'dest' is invalid.
     13psLogMsg_OPEN_FILE_FAILED              Could not open file '%s' for output.
     14psLogMsg_UNSUPPORTED_PROTOCOL          Do not know how to handle the protocol '%s'.
     15psLogMsg_UNKNOWN_KEY                   Unknown logging keyword %c.
    1616#
    1717# Error Messages from psMemory.c:
    1818#
    19 psMemory_NULL_BLOCK                            NULL memory block found.
    20 psMemory_DEREF_BLOCK_USE                       Memory block %ld was freed but still used.
    21 psMemory_UNDERFLOW                             Memory block %ld is corrupted; buffer underflow detected.
    22 psMemory_OVERFLOW                              Memory block %ld is corrupted; buffer overflow detected.
    23 psMemory_MULTIPLE_FREE                         Block %ld allocated at %s:%d freed more than once at %s:%d.
     19psMemory_NULL_BLOCK                    NULL memory block found.
     20psMemory_DEREF_BLOCK_USE               Memory block %ld was freed but still used.
     21psMemory_UNDERFLOW                     Memory block %ld is corrupted; buffer underflow detected.
     22psMemory_OVERFLOW                      Memory block %ld is corrupted; buffer overflow detected.
     23psMemory_MULTIPLE_FREE                 Block %ld allocated at %s:%d freed more than once at %s:%d.
    2424#
    2525# Error Messages from psString.c:
     
    2929# Error Messages from psTrace.c:
    3030#
    31 psTrace_NULL_SUBCOMPONENT                      Sub-component %d of node %s in trace tree is NULL.
    32 psTrace_NULL_TRACETREE                         Function %s called on a NULL trace level tree.
    33 psTrace_ADD_NULL_COMPONENT                     Failed to add null component to trace tree.
    34 psTrace_MALFORMED_COMPONENT_NAME               Failed to add '%s' to the root component tree; component must start with '.'.
    35 psTrace_FAILED_TO_ADD_COMPONENT                Failed to set trace level (%d) to '%s'.
     31psTrace_NULL_SUBCOMPONENT              Sub-component %d of node %s in trace tree is NULL.
     32psTrace_NULL_TRACETREE                 Function %s called on a NULL trace level tree.
     33psTrace_ADD_NULL_COMPONENT             Failed to add null component to trace tree.
     34psTrace_MALFORMED_COMPONENT_NAME       Failed to add '%s' to the root component tree; component must start with '.'.
     35psTrace_FAILED_TO_ADD_COMPONENT        Failed to set trace level (%d) to '%s'.
  • trunk/psLib/src/sysUtils/psSysUtilsErrors.h

    r1715 r1716  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2004-09-08 00:15:16 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2004-09-08 00:19:21 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    3030
    3131//~Start #define PS_ERRORTEXT_$1 "$2"
    32 #define PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED "The specified destination, %s, is malformed."
    33 #define PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID "The location, %s, for protocol 'dest' is invalid."
    34 #define PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED "Could not open file '%s' for output."
    35 #define PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL "Do not know how to handle the protocol '%s'."
    36 #define PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY "Unknown logging keyword %c."
     32#define PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED "The specified destination, %s, is malformed."
     33#define PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID "The location, %s, for protocol 'dest' is invalid."
     34#define PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED "Could not open file '%s' for output."
     35#define PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL "Do not know how to handle the protocol '%s'."
     36#define PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY "Unknown logging keyword %c."
    3737#define PS_ERRORTEXT_psMemory_NULL_BLOCK "NULL memory block found."
    3838#define PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE "Memory block %ld was freed but still used."
Note: See TracChangeset for help on using the changeset viewer.