[svn-upgrade] Integrating new upstream version, strongswan (4.3.2)

1 files changed, 17 insertions, 19 deletions

diff --git a/src/pluto/db_ops.h b/src/pluto/db_ops.h
index 4004e710a..464c245dd 100644
--- a/src/pluto/db_ops.h
+++ b/src/pluto/db_ops.h
@@ -10,47 +10,45 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * RCSID $Id: db_ops.h 3252 2007-10-06 21:24:50Z andreas $
  */
 
 #ifndef _DB_OPS_H
 #define _DB_OPS_H
 
 /*
- * 	Main db object, (quite proposal "oriented")
+ *      Main db object, (quite proposal "oriented")
  */
 #ifndef NO_DB_CONTEXT
 struct db_context {
-	struct db_prop prop;		/* proposal buffer (not pointer) */
-	struct db_trans *trans0;	/* transf. list, dynamically sized */
-	struct db_trans *trans_cur;	/* current transform ptr */
-	struct db_attr *attrs0;		/* attr. list, dynamically sized */
-	struct db_attr *attrs_cur;	/* current attribute ptr */
-	int max_trans;			/* size of trans list */
-	int max_attrs;			/* size of attrs list */
+		struct db_prop prop;            /* proposal buffer (not pointer) */
+		struct db_trans *trans0;        /* transf. list, dynamically sized */
+		struct db_trans *trans_cur;     /* current transform ptr */
+		struct db_attr *attrs0;         /* attr. list, dynamically sized */
+		struct db_attr *attrs_cur;      /* current attribute ptr */
+		int max_trans;                  /* size of trans list */
+		int max_attrs;                  /* size of attrs list */
 };
 /*
- * 	Allocate a new db object
+ *      Allocate a new db object
  */
 struct db_context * db_prop_new(u_int8_t protoid, int max_trans, int max_attrs);
-/*	Initialize object for proposal building  */
+/*      Initialize object for proposal building  */
 int db_prop_init(struct db_context *ctx, u_int8_t protoid, int max_trans, int max_attrs);
-/*	Free all resourses for this db */
+/*      Free all resourses for this db */
 void db_destroy(struct db_context *ctx);
 
-/*	Start a new transform */
+/*      Start a new transform */
 int db_trans_add(struct db_context *ctx, u_int8_t transid);
-/*	Add a new attribute by copying db_attr content */
+/*      Add a new attribute by copying db_attr content */
 int db_attr_add(struct db_context *db_ctx, const struct db_attr *attr);
-/*	Add a new attribute by value */
+/*      Add a new attribute by value */
 int db_attr_add_values(struct db_context *ctx,  u_int16_t type, u_int16_t val);
 
-/*	Get proposal from db object */
+/*      Get proposal from db object */
 static __inline__ struct db_prop *db_prop_get(struct db_context *ctx) {
-	return &ctx->prop;
+		return &ctx->prop;
 }
-/*	Show stats (allocation, etc) */
+/*      Show stats (allocation, etc) */
 #endif /* NO_DB_CONTEXT */
 int db_ops_show_status(void);
 #endif /* _DB_OPS_H */