Thread: [Aide-commits] aide branch, master, updated. v0.16a2-2-g581bb19
Brought to you by:
hvhaugwitz,
rvdb
From: Hannes v. H. <hvh...@us...> - 2013-05-06 18:39:04
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "aide". The branch, master has been updated via 581bb19ee7886db1df65cbb4a23879a4672859ad (commit) from 8919e59993d140b930112efb1c2dbbb50a2ddeeb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 581bb19ee7886db1df65cbb4a23879a4672859ad Author: Hannes von Haugwitz <ha...@vo...> Date: Mon May 6 20:22:18 2013 +0200 src/compare_db.c: minor code cleanup diff --git a/ChangeLog b/ChangeLog index 0ac55f8..c1b2d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2013-05-06 Hannes von Haugwitz <ha...@vo...> * src/compare_db.c: - fixed return value of database initialization + - minor code cleanup 2013-05-04 Hannes von Haugwitz <ha...@vo...> * src/compare_db.c: diff --git a/src/compare_db.c b/src/compare_db.c index f04da36..cf9bf01 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -344,9 +344,8 @@ snprintf(*values[0], l, "%s",s); int l; if (line==NULL || !(line->attr&attr)) { - *values = malloc(1 * sizeof (char*)); - easy_string("") - return 1; + *values = NULL; + return 0; #ifdef WITH_ACL } else if (DB_ACL&attr) { return acl2array(line->acl, &*values); @@ -475,9 +474,9 @@ static void print_dbline_attributes(db_line* oline, db_line* nline, DB_ATTR_TYPE k = 0; while (olen-p*k >= 0 || nlen-p*k >= 0) { c = k*(p-1); - if (oline==NULL || !(oline->attr&details_attributes[j]) ) { + if (!onumber) { error(2," %s%-9s%c %-*c %.*s\n", width_details%2?"":" ", i+k?"":details_string[j], i+k?' ':':', p, ' ', p-1, nlen-p*k>0?&nvalue[i][c]:""); - } else if (nline==NULL || !(nline->attr&details_attributes[j])) { + } else if (!nnumber) { error(2," %s%-9s%c %.*s\n", width_details%2?"":" ", i+k?"":details_string[j], i+k?' ':':', p-1, olen-p*k>0?&ovalue[i][c]:""); } else { error(2," %s%-9s%c %-*.*s| %.*s\n", width_details%2?"":" ", i+k?"":details_string[j], i+k?' ':':', p, p-1, olen-p*k>0?&ovalue[i][c]:"", p-1, nlen-p*k>0?&nvalue[i][c]:""); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + src/compare_db.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- aide |