From 1fe1417c393c87e5e87f753646f65fdc58a8fdf2 Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 17 Jul 2012 10:00:23 +0200 Subject: [PATCH] Apply patch from Anton Kochkov fixing whitespaces Bump 0.9.1hg to 0.9.1git as reported by @schrotthaufen --- AUTHORS | 8 +++++--- configure | 8 ++++---- configure.acr | 2 +- libr/anal/README | 2 +- libr/anal/cc.c | 6 +++--- libr/anal/diff.c | 8 ++++---- libr/anal/fcn.c | 2 +- libr/anal/meta.c | 4 ++-- libr/anal/op.c | 10 +++++----- libr/anal/type.c | 2 +- libr/anal/var.c | 4 ++-- libr/include/r_anal.h | 10 +++++----- libr/include/r_util.h | 2 +- r2-bindings/configure | 8 ++++---- r2-bindings/configure.acr | 2 +- 15 files changed, 40 insertions(+), 38 deletions(-) diff --git a/AUTHORS b/AUTHORS index 112f706210..2e6191c2ac 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ -Main developer (author) -======================= +Main developer (author and maintainer) +====================================== - pancake Secondary developers @@ -9,17 +9,19 @@ Secondary developers Contributors: (sorted by length) ================================ - - esteve - Anton Bolotinksy - Glyn Kennington - @schrotthaufen - elektranox - neuroflip - rvalles + - esteve - capi_x - rudi_s - vext01 + - xvilka - l0gic - eddyb - graz + - oxff - pof diff --git a/configure b/configure index bcb727729b..6df0709166 100755 --- a/configure +++ b/configure @@ -105,12 +105,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -c} - PKGNAME='radare2' ; VERSION='0.9.1hg' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='radare2' ; VERSION='0.9.1git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -212,7 +212,7 @@ case $flag in show_version ; ;; "-r"|"--r"|"--report") echo "PKGNAME: radare2" -echo "VERSION: 0.9.1hg" +echo "VERSION: 0.9.1git" echo "LANGS: c" echo "REQUIRED: libdl" echo "OPTIONAL: libmagic" diff --git a/configure.acr b/configure.acr index 20741ed559..86cad7983e 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME radare2 -VERSION 0.9.1hg +VERSION 0.9.1git CONTACT pancake ; pancake@nopcode.org LANG_C! diff --git a/libr/anal/README b/libr/anal/README index bfdb347a38..797f477d89 100644 --- a/libr/anal/README +++ b/libr/anal/README @@ -293,7 +293,7 @@ type = [ op | reg | mem | imm ] ; 2 bits is enought size = 1, 2, 4, 8 ; byte level ADD reg, reg -SUB reg, +SUB reg, reg JMP reg JMP imm JMP mem diff --git a/libr/anal/cc.c b/libr/anal/cc.c index 3481424630..af27fb0362 100644 --- a/libr/anal/cc.c +++ b/libr/anal/cc.c @@ -185,7 +185,7 @@ typedef struct { - type of value (int, ptr, flt) - name of reg ("eax", ..) - index of arg (0, 1, 2) - - + - RTL = push 3; push 2; push 1; call foo == foo(1,2,3) LTR = push 1; push 2; push 3; call foo == foo(1,2,3) @@ -209,7 +209,7 @@ Calling conventions: x86: cdecl, fastcall, stdcall cdecl: push args in the stack (right-to-left order) - return value in eax - + push eax push 123 push byte[ebp+30] @@ -287,7 +287,7 @@ arm: r0 : return value mips: - first 4 arguments as registers $a0-$a3 + first 4 arguments as registers $a0-$a3 next args in stack. return value in $v0 and $v1 diff --git a/libr/anal/diff.c b/libr/anal/diff.c index 9af3136d03..d1b6e4218d 100644 --- a/libr/anal/diff.c +++ b/libr/anal/diff.c @@ -79,7 +79,7 @@ R_API int r_anal_diff_fingerprint_fcn(RAnal *anal, RAnalFcn *fcn) { RAnalBlock *bb; RListIter *iter; int len = 0; - + if (anal && anal->cur && anal->cur->fingerprint_fcn) return (anal->cur->fingerprint_fcn (anal, fcn)); @@ -116,7 +116,7 @@ R_API int r_anal_diff_bb(RAnal *anal, RAnalFcn *fcn, RAnalFcn *fcn2) { #if 0 eprintf ("BB: %llx - %llx => %lli - %lli => %f\n", bb->addr, bb2->addr, bb->size, bb->size, t); -#endif +#endif if (t > anal->diff_thbb && t > ot) { ot = t; mbb = bb; @@ -165,7 +165,7 @@ R_API int r_anal_diff_fcn(RAnal *anal, RList *fcns, RList *fcns2) { #if 0 eprintf ("FCN NAME (NAME): %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name, fcn->size, fcn2->size, t); -#endif +#endif /* Set flag in matched functions */ fcn->diff->type = fcn2->diff->type = (t==1)? R_ANAL_DIFF_TYPE_MATCH: R_ANAL_DIFF_TYPE_UNMATCH; @@ -218,7 +218,7 @@ R_API int r_anal_diff_fcn(RAnal *anal, RList *fcns, RList *fcns2) { eprintf ("\n"); eprintf ("FCN: %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name, fcn->size, fcn2->size, t); -#endif +#endif if (t > anal->diff_thfcn && t > ot) { ot = t; mfcn = fcn; diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c index 86b90bdc30..cbc609216e 100644 --- a/libr/anal/fcn.c +++ b/libr/anal/fcn.c @@ -234,7 +234,7 @@ R_API RAnalFcn *r_anal_fcn_find(RAnal *anal, ut64 addr, int type) { r_list_foreach (anal->fcns, iter, fcn) { if (!type || (fcn->type & type)) { if (addr == fcn->addr || (ret == NULL && (addr > fcn->addr && addr < fcn->addr+fcn->size))) - ret = fcn; + ret = fcn; } } return ret; diff --git a/libr/anal/meta.c b/libr/anal/meta.c index 3941d0d45d..cd7519bfc3 100644 --- a/libr/anal/meta.c +++ b/libr/anal/meta.c @@ -162,7 +162,7 @@ R_API int r_meta_comment_check (RMeta *m, const char *s) { if (d->type == R_META_TYPE_COMMENT && (!strcmp (s, d->str))) return R_TRUE; } - + return R_FALSE; } @@ -285,7 +285,7 @@ static void printmetaitem(RMeta *m, RMetaItem *d, int rad) { if (d->type=='s' && !*str) return; r_str_sanitize (str); - if (rad) + if (rad) m->printf ("%s %d %s @ 0x%08"PFMT64x"\n", r_meta_type_to_string (d->type), (int)(d->to-d->from), str, d->from); diff --git a/libr/anal/op.c b/libr/anal/op.c index 24e1813599..f96b7105a5 100644 --- a/libr/anal/op.c +++ b/libr/anal/op.c @@ -74,14 +74,14 @@ R_API int r_anal_op_execute (RAnal *anal, RAnalOp *op) { break; case R_ANAL_OP_TYPE_ADD: // dst = src[0] + src[1] + src[2] - r_anal_value_set_ut64 (anal, op->dst, + r_anal_value_set_ut64 (anal, op->dst, r_anal_value_to_ut64 (anal, op->src[0])+ r_anal_value_to_ut64 (anal, op->src[1])+ r_anal_value_to_ut64 (anal, op->src[2])); break; case R_ANAL_OP_TYPE_SUB: // dst = src[0] + src[1] + src[2] - r_anal_value_set_ut64 (anal, op->dst, + r_anal_value_set_ut64 (anal, op->dst, r_anal_value_to_ut64 (anal, op->src[0])- r_anal_value_to_ut64 (anal, op->src[1])- r_anal_value_to_ut64 (anal, op->src[2])); @@ -92,18 +92,18 @@ R_API int r_anal_op_execute (RAnal *anal, RAnalOp *op) { if (div == 0) { eprintf ("r_anal_op_execute: division by zero\n"); eprintf ("TODO: throw RAnalException\n"); - } else r_anal_value_set_ut64 (anal, op->dst, + } else r_anal_value_set_ut64 (anal, op->dst, r_anal_value_to_ut64 (anal, op->src[0])/div); } break; case R_ANAL_OP_TYPE_MUL: - r_anal_value_set_ut64 (anal, op->dst, + r_anal_value_set_ut64 (anal, op->dst, r_anal_value_to_ut64 (anal, op->src[0])* r_anal_value_to_ut64 (anal, op->src[1])); break; case R_ANAL_OP_TYPE_MOV: // dst = src[0] - r_anal_value_set_ut64 (anal, op->dst, + r_anal_value_set_ut64 (anal, op->dst, r_anal_value_to_ut64 (anal, op->src[0])); break; case R_ANAL_OP_TYPE_NOP: diff --git a/libr/anal/type.c b/libr/anal/type.c index 0188afc8b2..c64258aaef 100644 --- a/libr/anal/type.c +++ b/libr/anal/type.c @@ -19,7 +19,7 @@ CFt exit void=int CFv [arraysize] [type] [name] CFa [arraysize] [type] [name] CFf 320 @ fun -> framesize for function -CF 20 +CF 20 #endif // how to define a function pointer? diff --git a/libr/anal/var.c b/libr/anal/var.c index b73bb882e2..84cfa65831 100644 --- a/libr/anal/var.c +++ b/libr/anal/var.c @@ -157,7 +157,7 @@ R_API RAnalVar *r_anal_var_get(RAnal *anal, RAnalFcn *fcn, int delta, int type) return NULL; } -// XXX: rename function type? i think this is 'scope' +// XXX: rename function type? i think this is 'scope' R_API const char *r_anal_var_type_to_str (RAnal *anal, int type) { if (type & R_ANAL_VAR_TYPE_GLOBAL) return "global"; @@ -231,7 +231,7 @@ R_API void r_anal_var_list_show(RAnal *anal, RAnalFcn *fcn, ut64 addr) { /* TODO: detect pointer to strings and so on */ //if (string_flag_offset(NULL, buf, value, 0)) // r_cons_printf(" ; %s\n", buf); - //else + //else eprintf ("\n"); //r_cons_newline(); } } diff --git a/libr/include/r_anal.h b/libr/include/r_anal.h index 8749b8d00b..5d4f44cce9 100644 --- a/libr/include/r_anal.h +++ b/libr/include/r_anal.h @@ -15,7 +15,7 @@ // containing a dupped file in memory /* save memory: - bb_has_ops=1 -> 600M + bb_has_ops=1 -> 600M bb_has_ops=0 -> 350MB */ #define R_ANAL_BB_HAS_OPS 0 @@ -94,8 +94,8 @@ enum { R_ANAL_OP_TYPE_NOT = 0x8000000, R_ANAL_OP_TYPE_STORE = 0x10000000, /* store from register to memory */ R_ANAL_OP_TYPE_LOAD = 0x20000000, /* load from memory to register */ - R_ANAL_OP_TYPE_LEA = 0x40000000, - R_ANAL_OP_TYPE_LEAVE = 0x80000000, + R_ANAL_OP_TYPE_LEA = 0x40000000, + R_ANAL_OP_TYPE_LEAVE = 0x80000000, }; /* TODO: what to do with signed/unsigned conditionals? */ @@ -287,7 +287,7 @@ typedef struct r_anal_cc_t { typedef struct r_anal_cc_type_t { int rtl; // right-to-left? if false use left-to-right int alignstack; - // + // //const char **reglist; // } RAnalCCType; @@ -539,7 +539,7 @@ R_API int r_anal_cond_eval (RAnal *anal, RAnalCond *cond); R_API RAnalCond *r_anal_cond_new_from_string(const char *str); /* reflines.c */ -R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal, +R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal, ut64 addr, ut8 *buf, ut64 len, int nlines, int linesout, int linescall); R_API char* r_anal_reflines_str(struct r_anal_t *anal, struct r_anal_refline_t *list, ut64 addr, int opts); diff --git a/libr/include/r_util.h b/libr/include/r_util.h index a5eed3f1f4..e78614a097 100644 --- a/libr/include/r_util.h +++ b/libr/include/r_util.h @@ -224,7 +224,7 @@ R_API boolt r_file_is_directory(const char *str); R_API RMmap *r_file_mmap (const char *file, boolt rw); R_API void r_file_mmap_free (RMmap *m); -// TODO: find better names and write vapis +// TODO: find better names and write vapis #define ut8p_b(x) ((x)[0]) #define ut8p_bw(x) ((x)[0]|((x)[1]<<8)) #define ut8p_bd(x) ((x)[0]|((x)[1]<<8)|((x)[2]<<16)|((x)[3]<<24)) diff --git a/r2-bindings/configure b/r2-bindings/configure index 20dc9e51f4..245fa45758 100755 --- a/r2-bindings/configure +++ b/r2-bindings/configure @@ -97,12 +97,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -c} - PKGNAME='radare2-bindings' ; VERSION='0.9.1hg' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='radare2-bindings' ; VERSION='0.9.1git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -195,7 +195,7 @@ case $flag in show_version ; ;; "-r"|"--r"|"--report") echo "PKGNAME: radare2-bindings" -echo "VERSION: 0.9.1hg" +echo "VERSION: 0.9.1git" echo "LANGS: c c++" echo "PKG-CONFIG: r_core" echo "FLAGS: --enable-devel --with-cc=gcc --with-cxx=g++ --with-ostype=auto" diff --git a/r2-bindings/configure.acr b/r2-bindings/configure.acr index 328b5312b9..4639a5fcc5 100644 --- a/r2-bindings/configure.acr +++ b/r2-bindings/configure.acr @@ -1,5 +1,5 @@ PKGNAME radare2-bindings -VERSION 0.9.1hg +VERSION 0.9.1git CONTACT pancake ; pancake@nopcode.org LANG_C!