(file) Return to CIMStatusCode.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/CIMStatusCode.cpp between version 1.4.14.4 and 1.13.2.1

version 1.4.14.4, 2003/08/14 11:55:42 version 1.13.2.1, 2006/02/10 16:09:35
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 25 
Line 33 
 // //
 // Modified By: Carol Ann Krug Graves, Hewlett-Packard Company // Modified By: Carol Ann Krug Graves, Hewlett-Packard Company
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 118 
Line 127 
     "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_FOUND"     "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_FOUND"
 }; };
  
 // l10n TOD0 - the first func should go away when all Pegasus is globalized  // l10n TODO - the first func should go away when all Pegasus is globalized
  
 const char* cimStatusCodeToString(CIMStatusCode code) const char* cimStatusCodeToString(CIMStatusCode code)
 { {
     if (Uint32(code) < CIM_ERR_METHOD_NOT_FOUND)      if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
         return _cimMessages[Uint32(code)];         return _cimMessages[Uint32(code)];
  
     return "Unrecognized CIM status code";     return "Unrecognized CIM status code";
 } }
  
   
 String cimStatusCodeToString(CIMStatusCode code, String cimStatusCodeToString(CIMStatusCode code,
                                                         const ContentLanguages& contentLanguages)                               const ContentLanguageList& contentLanguages)
 { {
         AcceptLanguages acceptLanguages;      MessageLoaderParms parms;
         MessageLoaderParms parms(_cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);  
         if (contentLanguages.size() == 0) //use AcceptLanguages::EMPTY      if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
         {         {
                 return MessageLoader::getMessage(parms);          parms = MessageLoaderParms(
               _cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);
         }         }
         else         else
         {         {
                 //build AcceptLanguages from contentLanguages, use in getMessage          parms = MessageLoaderParms(
                 parms.acceptlanguages = AcceptLanguages(contentLanguages.getLanguageElement(0).getTag());              "Common.CIMStatusCode.UNRECOGNIZED_STATUS_CODE",
                 return MessageLoader::getMessage(parms);              "Unrecognized CIM status code \"$0\"", Uint32(code));
         }         }
   
       if (contentLanguages.size() > 0)
       {
           //build AcceptLanguageList from contentLanguages, use in getMessage
           parms.acceptlanguages.clear();
           parms.acceptlanguages.insert(contentLanguages.getLanguageTag(0), 1.0);
       }
   
       return MessageLoader::getMessage(parms);
 } }
  
 // l10n // l10n
 ContentLanguages cimStatusCodeToString_Thread(String & message, CIMStatusCode code)  ContentLanguageList cimStatusCodeToString_Thread(
       String & message,
       CIMStatusCode code)
   {
       MessageLoaderParms parms;
   
       if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
       {
           parms = MessageLoaderParms(
               _cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);
       }
       else
 { {
         MessageLoaderParms parms(_cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);          parms = MessageLoaderParms(
               "Common.CIMStatusCode.UNRECOGNIZED_STATUS_CODE",
               "Unrecognized CIM status code \"$0\"", Uint32(code));
       }
   
         //parms.useThreadLocale = true;         //parms.useThreadLocale = true;
         message = MessageLoader::getMessage(parms);         message = MessageLoader::getMessage(parms);
         return parms.contentlanguages;         return parms.contentlanguages;

Legend:
Removed from v.1.4.14.4  
changed lines
  Added in v.1.13.2.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2