From 935790b0e631d51dc71219955102efc3ec78f27b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Jan 2010 11:49:47 +0100
Subject: [PATCH] maintainer clean, autoreconfig'ed
---
pub/src/mystd.cpp | 72 ++++++++----------
pub/src/mystd.h | 45 +++++------
pub/yaml-cpp/src/.libs/libyaml4frida.a | 1 -
pub/yaml-cpp/src/.libs/libyaml4frida.so | 1 -
pub/yaml-cpp/src/.libs/libyaml4frida.so.0 | 1 -
pub/yaml-cpp/src/.libs/libyaml4frida.so.0.0.0 | Bin 4100 -> 0 bytes
6 files changed, 56 insertions(+), 64 deletions(-)
delete mode 100644 pub/yaml-cpp/src/.libs/libyaml4frida.a
delete mode 120000 pub/yaml-cpp/src/.libs/libyaml4frida.so
delete mode 120000 pub/yaml-cpp/src/.libs/libyaml4frida.so.0
delete mode 100755 pub/yaml-cpp/src/.libs/libyaml4frida.so.0.0.0
diff --git a/pub/src/mystd.cpp b/pub/src/mystd.cpp
index ee8ae069..904b343e 100644
--- a/pub/src/mystd.cpp
+++ b/pub/src/mystd.cpp
@@ -11,9 +11,11 @@
#include <sys/time.h>
#include <glob.h>
#include <iostream>
+#include <boost/format.hpp>
#include "mystd.h"
+using boost::format;
//! declare auxiliary functions.
@@ -34,47 +36,39 @@ const double mystd::PI = 3.1415926535897931;
//* convert to string *//
//**************************************************************************//
-string strg(const string& val)
+string strg( const string& val )
{
return val;
}
-string strg(const bool& val) {
+string strg( bool val) {
if (val)
return "y";
else
return "n";
}
-string strg(const double& val)
+string strg( double val )
{
- char s[40];
- sprintf(s, "%g", val);
- return s;
+ return str( format( "%g" ) % val );
}
-string strg(const int& val)
+string strg( int val )
{
- char s[40];
- sprintf(s, "%d", val);
- return s;
+ return str( format( "%d" ) % val )
}
-string strg(const uint& val)
+string strg( uint val )
{
- char s[40];
- sprintf(s, "%u", val);
- return s;
+ return str( format( "%u" ) % val )
}
-string strg(const unsigned long& val)
+string strg( unsigned long val)
{
- char s[40];
- sprintf(s, "%lu", val);
- return s;
+ return str( format( "%lu" ) % val )
}
-string strg(const char& val)
+string strg( char val )
{
return string(1, val);
}
@@ -173,7 +167,7 @@ bool mystd::str2vec( string inp, vector<double> *V, uint nmax, bool force )
return true;
}
-bool mystd::any2dbl( const string inp, double *val )
+bool mystd::any2dbl( const string& inp, double *val )
{
if(!inp.size()) {
cout << "expecting double, found empty input\n";
@@ -203,7 +197,7 @@ bool mystd::any2dbl( const string inp, double *val )
return false;
}
-bool mystd::any2int(const string inp, int *val)
+bool mystd::any2int( const string& inp, int *val )
{
if(!inp.size()) {
cout << "expecting integer, found empty input\n";
@@ -219,7 +213,7 @@ bool mystd::any2int(const string inp, int *val)
return false;
}
-bool mystd::any2uint(const string inp, uint *val)
+bool mystd::any2uint( const string& inp, uint *val )
{
if(!inp.size()) {
cout << "expecting integer, found empty input\n";
@@ -235,7 +229,7 @@ bool mystd::any2uint(const string inp, uint *val)
return false;
}
-void mystd::string_extract_word( const string in, string *out1, string *out2 )
+void mystd::string_extract_word( const string& in, string *out1, string *out2 )
{
// one word (*out1) is extracted; leading " \t" are retained.
// in the tail (*out2) leading " \t" are deleted.
@@ -274,7 +268,7 @@ void mystd::string_extract_word( const string in, string *out1, string *out2 )
//cout << "from ["<<in<<"] word ["<<*out1<<"] and tail ["<<*out2<<"]\n";
}
-void mystd::string_extract_line(const string in, string *out1, string *out2)
+void mystd::string_extract_line( const string& in, string *out1, string *out2 )
{
string line;
string::size_type i = in.find('\n');
@@ -306,7 +300,7 @@ void mystd::system( string cmd )
//! Seconds since the epoch. Return them as double (WHY??)
// only used for calls to myasctime => OBSOLETE
-double mystd::justnow(void)
+double mystd::justnow()
{
struct timeval exactlynow;
gettimeofday(&exactlynow, NULL);
@@ -316,7 +310,7 @@ double mystd::justnow(void)
//! Return time as string in ctime/asctime standard format.
// OBSOLETE: better use strftime
-string mystd::myasctime(double time, int offs)
+string mystd::myasctime( double time, int offs )
{
long timin = (long) time;
char buf[40];
@@ -331,7 +325,7 @@ string mystd::myasctime(double time, int offs)
//! Round given value to given number of digits.
-double mystd::round_decimal(double val, double digits)
+double mystd::round_decimal( double val, double digits )
{
if (val==0 || digits<=0) return 0;
double v = fabs(val);
@@ -349,7 +343,7 @@ double mystd::round_decimal(double val, double digits)
//! insert val into vector *V, presuming the latter is sorted
-void mystd::merge(vector<double> *V, double val)
+void mystd::merge( vector<double> *V, double val )
{
for (uint i=0; i<V->size(); ++i) {
if (val>(*V)[i]) continue;
@@ -374,7 +368,7 @@ bool mystd::get_const(vector<double> *V, double *val)
}
*/
-void mystd::unique(vector<double> *V, double tolabs, double tolrel)
+void mystd::unique( vector<double> *V, double tolabs, double tolrel )
{
// tolrel z.Zt. nicht benutzt
vector<double> aux;
@@ -435,7 +429,7 @@ double mystd::sum( const vector<double>& V )
//* file names, globbing, file read *//
//**************************************************************************//
-void mystd::fname_divide( const string fname,
+void mystd::fname_divide( const string& fname,
string *fdir, string *fshort, string *fext )
// divide "dir/short.ext" into "dir", "short", "ext"
// if some of the three return values are not needed, the user may supply 0
@@ -454,8 +448,8 @@ void mystd::fname_divide( const string fname,
}
}
-int mystd::glob_file_list( const string text,
- const string pre, const string ext,
+int mystd::glob_file_list( const string& text,
+ const string& pre, const string& ext,
vector<string> *flong, vector<string> *fshort )
// input:
// text: bash-like file list
@@ -494,8 +488,8 @@ int mystd::glob_file_list( const string text,
return flong->size();
}
-int mystd::glob_one_file(const string text, const string pre, const string ext,
- string *fname)
+int mystd::glob_one_file( const string& text, const string& pre,
+ const string& ext, string *fname)
{
vector<string> flong, fshort;
int ret = glob_file_list(text, pre, ext, &flong, &fshort);
@@ -503,8 +497,8 @@ int mystd::glob_one_file(const string text, const string pre, const string ext,
return ret;
}
-FILE* mystd::glob_fopen(const string text, const string pre, const string ext,
- const char* mod, string *fname)
+FILE* mystd::glob_fopen( const string& text, const string& pre,
+ const string& ext, const char* mod, string *fname)
{
string flong;
if (glob_one_file(text, pre, ext, &flong)!=1) return 0;
@@ -537,9 +531,9 @@ int mystd::freadln( FILE *fd, string *s )
#include <gsl/gsl_integration.h>
double mystd::Integrate( double (*func_) (double, void*), void *data_,
- const double low, const double hig,
- const uint mode, const double epsabs,
- const double epsrel )
+ double low, double hig,
+ uint mode, double epsabs,
+ double epsrel )
{
gsl_function F;
F.function = func_;
diff --git a/pub/src/mystd.h b/pub/src/mystd.h
index f49d0a9f..1439e600 100644
--- a/pub/src/mystd.h
+++ b/pub/src/mystd.h
@@ -9,13 +9,13 @@
using namespace std;
//! convert to string
-string strg(const string& val);
-string strg(const bool& val);
-string strg(const int& val);
-string strg(const uint& val);
-string strg(const ulong& val);
-string strg(const char& val);
-string strg(const double& val);
+string strg( const string& val );
+string strg( bool val );
+string strg( int val );
+string strg( uint val );
+string strg( ulong val );
+string strg( char val );
+string strg( double val );
//! yaml
string yaml( const string );
@@ -28,14 +28,14 @@ namespace mystd {
//! convert from string
bool str2vec( string inp, vector<double> *V, uint nmax=0, bool force=true );
- bool any2dbl( const string inp, double *val );
- bool any2int( const string inp, int *val );
- bool any2uint( const string inp, uint *val );
- void string_extract_word( const string in, string *out1, string *out2 );
- void string_extract_line( const string in, string *out1, string *out2 );
+ bool any2dbl( const string& inp, double *val );
+ bool any2int( const string& inp, int *val );
+ bool any2uint( const string& inp, uint *val );
+ void string_extract_word( const string& in, string *out1, string *out2 );
+ void string_extract_line( const string& in, string *out1, string *out2 );
//! string operations
- string strip( string const& str, char const* sepSet=" \n" );
+ string strip( const string& str, const char* sepSet=" \n" );
//! improved libc calls
void system( string cmd );
@@ -57,19 +57,20 @@ namespace mystd {
double sum( const vector<double>& V );
// file names, globbing, file read
- void fname_divide( const string fname, string *fdir, string *fshort, string *fext);
- int glob_file_list(const string text,
- const string pre, const string ext,
+ void fname_divide( const string& fname, string *fdir,
+ string *fshort, string *fext);
+ int glob_file_list(const string& text,
+ const string& pre, const string& ext,
vector<string> *flong, vector<string> *fshort=0);
- int glob_one_file(const string text,
- const string pre, const string ext, string *fname);
- FILE* glob_fopen(const string text, const string pre, const string ext,
+ int glob_one_file(const string& text,
+ const string& pre, const string& ext, string *fname);
+ FILE* glob_fopen(const string& text, const string& pre, const string& ext,
const char* mod, string *fname=0);
int freadln( FILE *fd, string *s );
// integration
double Integrate( double (*func_) (double, void*), void *data_,
- const double low, const double hig,
- const uint mode, const double epsabs,
- const double epsrel );
+ double low, double hig,
+ uint mode, double epsabs,
+ double epsrel );
}
diff --git a/pub/yaml-cpp/src/.libs/libyaml4frida.a b/pub/yaml-cpp/src/.libs/libyaml4frida.a
deleted file mode 100644
index 8b277f0d..00000000
--- a/pub/yaml-cpp/src/.libs/libyaml4frida.a
+++ /dev/null
@@ -1 +0,0 @@
-!<arch>
diff --git a/pub/yaml-cpp/src/.libs/libyaml4frida.so b/pub/yaml-cpp/src/.libs/libyaml4frida.so
deleted file mode 120000
index e7b066e9..00000000
--- a/pub/yaml-cpp/src/.libs/libyaml4frida.so
+++ /dev/null
@@ -1 +0,0 @@
-libyaml4frida.so.0.0.0
\ No newline at end of file
diff --git a/pub/yaml-cpp/src/.libs/libyaml4frida.so.0 b/pub/yaml-cpp/src/.libs/libyaml4frida.so.0
deleted file mode 120000
index e7b066e9..00000000
--- a/pub/yaml-cpp/src/.libs/libyaml4frida.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libyaml4frida.so.0.0.0
\ No newline at end of file
diff --git a/pub/yaml-cpp/src/.libs/libyaml4frida.so.0.0.0 b/pub/yaml-cpp/src/.libs/libyaml4frida.so.0.0.0
deleted file mode 100755
index 2c461719b9a42a5978acebacb26092fddb0bc389..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4100
zcmb<-^>JflWMqH=W(H;k5bpsq1A_?z1A_@WM8<?cfq|7lgF%`>0xS;^g^)j37#Kj9
z6~q-_0Lz2;KSUT9KsbPrfgysCfq@Mw&&0sMz{ASGz#|I55{wKCAPkacVPIeY;VTRb
z3^1(1z`y{)AaM{5d|HwMG723d>la~QU|?ooU~u;fWnj>qUFEX-jd_Kf(Gi!UFP?>e
z`Irlm<6>Z7;DFi(;={}X`5)wMP6h@BkXu3GAhW^#gPIF+2S^Si-oc<C$Z*7g6C?)W
zgY@lsJgLUn_39g${0{CLg%L74dq48MzWkmKWEL_8*#+Y(FfcG^!#E5K3?RM?5?_gd
zf#Eg-14DoqL{Na?<Np&33=AGf{5xp!=h5T^7#J8zpq>?C;9>x2y#aDK0|SE)11|$Z
ze0+LteqMZWNn%k+d^|&ZW?p6qLws6hUM53)d~!u1h?$s^S(VBV?^PBbl$xGdT#{Pk
zoRe5woLbC~lbMuVUanW1uV(;a=j7&Q=D~TDiMctt1|Y5xNU|t3F(oH6FBK$U3KB?5
zD=9Yy@r*&d^x_;48*EN`aZYklPGT`!AQ!|k11T#g$p9Gy;)9hYgIHz^@u?|^C5a62
z@kzzS5YI5gr{<-Abby>;l2(+Nk_b|2z~JuV>Es-5q-UsS3<+0ItTQs8!hH-344|+B
zsVJ7u<OHet4B{{_Ft~_8(vgZ70|Of)1A_*LW@2E_0nyA13^rm64D5^y3=SZgnSmj+
z^J#GN8<rO!?a_^gHwZB>bWi^B|NsBiOC_u?<QNzjUK|Axpo|m|ee&@C&7cVSzZjHO
zL3;i#=3!u9$N({4KKTFt|Nq4xmt}yYUtakC|363qhC@4_h6TS^%fP_Uc-T#dfuZ@0
zK*MeckZfseck>^Rr3Xs*x|>1yrISVF#fJa?|95wTQeAKJm4E;L_fEd>@Be?z3kQEN
z^%nfM{8+5eyA7nf*O9Ta8Kmt0lxC0$h#t$2MbC~kgN$cvJ|Yku7ke1w*B5$V>yHb9
ztY_(-eB&S3tD@bLe}L@2RKnfc3=->PQTczV`3OsN?BQ-1mBSN20OJ0)|NsAQJlrP8
zz|h@%;@|)O%|HH^NcL_9F?+YDf!x#lj^+P_Znowh|4YBX>_rM=A3+9&7a#up{~sBB
z@-Rp}DA<r`5F3;i?HM5Dmp7D-gwmkU2FX`K`R!18GL&8drPo1eP<jDn_6MM{4w~n9
z85kHqc?}esKNuJozW)24Z^FpH04i4mm>}h20V4wgs9XX?A~!V6fwHTC7%0U-(jX|V
z1Q{3@#2FYEQkWSSKx`LgQ2vFK8N$$V?ce|Z`6|o|4FCWC&j-2v!~g&J0?Z5yzo2}O
zpGn1_G8?967c&FHDP~CecXxKSQqXWoP0CEnQ!vpp)-%yH(}XY>81#xOb4wDF81#xu
ziXe0bjFp#PlB$=USE`p(nwgWLo0-A@=4B)nXE5lcROS^|=0fO_B8W^`YEf}!ejW-Z
zzKB7uC^ZM99>OTdDPhn9mt1-!sTCy*df@U)FEt}Rttc@!l|e7LB)_PbK`#YDWhEDZ
zElJGHOlHta&o2QJdSFw)#fV-~aWR8la(-@ZYF-J<`vhre1_lODJp!sHkn1v-Mo>Bc
zv5goYX#k`SlrBKn23jwH<U#5{7?h2^{r{g2QU^*mAdF3&1p@;EDD8mMfzlHQFM!$s
zN(UgbKqZC)v@Qdw1EoI@2BkZYogfTS3!*(3AZZA!j+uc0l!icQ5M&NW9wZLJp$rTR
zpfm?!gVG%cgX%C)`UaT=QxB@VL3JcZ9Vp#`Fi0It9z=r*vs?xS2ADcfItO8pyFv0G
z|AA<bx-w{<1J%8tx($R4Kn{aqkU9{v5J}w<W(EcjMpp+?TZ5zy)D8k+P@I6w0AY|D
zKy(w5I#9j_VNj6>k^^CoSs=Otst)AeFDwiUAPkcO$-~%_pz1*R9n@|DwV^=%1E~RF
zn7Wxr>KH^J5sOV7D9%CQ4l<8Jl!1YR71Fi>nFYcy^OiC|${vt9Q2qwB%|PujP`ts^
zfy{@MZ6I}^x=w|SfdNz#fz*I7$UG3<jO0F0xn;n{zyL}wAT=NiQUk(!kko<dP!~4r
z?mGl6&p`Hq+BzO=kop#676^mP0@25z=E33=qz*YgKw$yGpz;!A7Dx{Wr?4?FTmUhk
z7^DWo1ks>41F=Ckhns=HfSG|oih+Sa3z|PcX#tc*k<FXK$H0&Q(hSlBbrY0{L4nEz
zkRYVh&A<RlXUx!+Cn%3Y<RLbI@-l=E@ii#VLimu_0_9BzACwyy7(jUt!UvT^3=E*W
z2H}HZ6jFac_#j^(+J?;FS_qOyAo8Fb$G`x}3lKge=0Ry5!UxrEkhBfqgK9rW`yayR
z2T=^*^a?I_Kq1G#07{o231)CD2I&t#_(C9x0hG=_3}yyUt;WCrN>30zBt?PJ4TKNM
z2#B^YGq`07l7V1m260ex3c>-$-N*kRAAs^1NRW|%9~`eR_c1aEFld0%9mH4$Mg~C!
zQwD_pnHYE&Ky3t2dIUu^BZC-26axc;j~FBkgZQ8}Ljok47(nVl>OgjZFbl)S|Dc-W
z55yY`Ap08`5aGwjz{k*!X8&vk28IPl=51s^ga;$j$N!-84+{@QCQ)$zi3R3<CIN<r
z3=9m@VfvYPz-bMX-$CvH=|}1Yg8Lo<NDc;-&nk?leGd&rNP7mPAJliyV?=~MsBdD0
zrrsV+-VMooP~Rqr5t05teG`V{qLSj0(zG<aWQO>7=Mev(cpuN;5Kylq-UWr{<%}ei
zk{_R*lb@8B6A!N5;}c6O7?SgI3vyCRQd9Iy%}p&CKoaqpDHVFA=4OTr;5I>gN@;Fx
zCCnaIKNqkyZb6Q|uJJG)$Ql?MVGFn|0k$RH-N)a_(I?*D%`Mn9BtFE^$;UOGAwE8(
zI6pokF)t-2l_4JDa+oQZW)^08>8U001<COx8KrsIdPx-w@h*{mj=rAG7=1A;9WGFx
b2Gk`3_0G_`I`A$Ka<9$70lB*a>D>VU;k=O^
--
GitLab