[Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module. Commit message: removed tabs Requested reviews: Matthias Brantner (matthias-brantner) Till Westmann (tillw) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 removed tabs -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. === modified file 'src/hash.xq.src/hash.h' --- src/hash.xq.src/hash.h 2012-07-27 03:31:52 + +++ src/hash.xq.src/hash.h 2013-01-11 22:37:23 + @@ -25,51 +25,51 @@ #include zorba/base64_stream.h namespace zorba { namespace security { - - class HashModule : public ExternalModule - { + +class HashModule : public ExternalModule +{ private: - static ItemFactory* theFactory; - +static ItemFactory* theFactory; + protected: - class ltstr - { -public: - bool - operator()(const String s1, const String s2) const - { -return s1.compare(s2) 0; - } - }; - - typedef std::mapString, ExternalFunction*, ltstr FuncMap_t; - FuncMap_t theFunctions; - -public: - virtual ~HashModule(); - - virtual String - getURI() const { return http://www.zorba-xquery.com/modules/cryptography/hash;; } - - virtual ExternalFunction* - getExternalFunction(const String aLocalname); - - virtual void - destroy(); +class ltstr +{ +public: + bool + operator()(const String s1, const String s2) const + { +return s1.compare(s2) 0; + } +}; + +typedef std::mapString, ExternalFunction*, ltstr FuncMap_t; +FuncMap_t theFunctions; + +public: +virtual ~HashModule(); + +virtual String +getURI() const { return http://www.zorba-xquery.com/modules/cryptography/hash;; } + +virtual ExternalFunction* +getExternalFunction(const String aLocalname); + +virtual void +destroy(); static String getStringArgument(const ExternalFunction::Arguments_t aArgs, int aIndex); static Item getItemArgument(const ExternalFunction::Arguments_t aArgs, int aIndex); - - static ItemFactory* - getItemFactory() - { - if(!theFactory) -theFactory = Zorba::getInstance(0)-getItemFactory(); - return theFactory; - } + +static ItemFactory* +getItemFactory() +{ + if(!theFactory) +theFactory = Zorba::getInstance(0)-getItemFactory(); + return theFactory; +} zorba::ItemSequence_t hash(const ExternalFunction::Arguments_t aArgs) const; @@ -151,7 +151,7 @@ zorba::ItemSequence_t(new zorba::SingletonItemSequence( getItemFactory()-createBase64Binary(lBuf[0], DIGEST_LENGTH))); } - }; + }; class HashFunction : public NonContextualExternalFunction { @@ -198,7 +198,7 @@ } }; - + } /* namespace security */ } /* namespace zorba */ -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
The proposal to merge lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/security-tab-cleanup-2013-01-11T22-53-37.222Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
Validation queue job security-tab-cleanup-2013-01-11T22-53-37.222Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module
The proposal to merge lp:~zorba-coders/zorba/security-tab-cleanup into lp:zorba/security-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 -- https://code.launchpad.net/~zorba-coders/zorba/security-tab-cleanup/+merge/142995 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp