From 63b02e326652929cfe753848b02381e131e53127 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 26 Nov 2002 22:18:34 +0000 Subject: [PATCH] Remove // comments --- index/extract.c | 3 +-- index/index.h | 4 +--- index/zebraapi.c | 4 +--- isamc/isamd-p.h | 9 ++++++--- isamc/isamd.c | 9 ++++++--- isamc/merge-d.c | 29 +++++++++++++---------------- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/index/extract.c b/index/extract.c index 7b3e108..a7ef24f 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,4 +1,4 @@ -/* $Id: extract.c,v 1.131 2002-11-15 21:26:00 adam Exp $ +/* $Id: extract.c,v 1.132 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -944,7 +944,6 @@ int bufferExtractRecord (ZebraHandle zh, char subType[1024]; void *clientData; SYSNO sysnotmp; - // const char *fname = ""; Record rec; long recordOffset = 0; struct zebra_fetch_control fc; diff --git a/index/index.h b/index/index.h index 90cdd02..56441ae 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.91 2002-11-15 21:26:00 adam Exp $ +/* $Id: index.h,v 1.92 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -170,8 +170,6 @@ void zebra_load_atts (data1_handle dh, Res res); int key_SU_decode (int *ch, const unsigned char *out); int key_SU_encode (int ch, char *out); -// extern Res common_resource; - #define ENCODE_BUFLEN 768 struct encode_info { int sysno; /* previously written values for delta-compress */ diff --git a/index/zebraapi.c b/index/zebraapi.c index 04399f9..8dbfe58 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.78 2002-11-18 11:07:59 adam Exp $ +/* $Id: zebraapi.c,v 1.79 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -448,8 +448,6 @@ void zebra_close (ZebraHandle zh) } sp = &(*sp)->next; } -// if (!zs->sessions && zs->stop_flag) -// zebra_register_deactivate(zs); zebra_mutex_cond_unlock (&zs->session_lock); xfree (zh->reg_name); xfree (zh); diff --git a/isamc/isamd-p.h b/isamc/isamd-p.h index 95b8d46..6eb4320 100644 --- a/isamc/isamd-p.h +++ b/isamc/isamd-p.h @@ -1,4 +1,4 @@ -/* $Id: isamd-p.h,v 1.11 2002-08-02 19:26:56 adam Exp $ +/* $Id: isamd-p.h,v 1.12 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -119,7 +119,7 @@ struct ISAMD_PP_s { sizeof(ISAMD_BLOCK_SIZE) + \ sizeof(ISAMD_BLOCK_SIZE)) /* == 12 (was 16) */ -// sizeof(int) + +/* sizeof(int) + */ int isamd_alloc_block (ISAMD is, int cat); @@ -141,7 +141,10 @@ int singleton_encode(struct it_key *k); /* * $Log: isamd-p.h,v $ - * Revision 1.11 2002-08-02 19:26:56 adam + * Revision 1.12 2002-11-26 22:18:34 adam + * Remove // comments + * + * Revision 1.11 2002/08/02 19:26:56 adam * Towards GPL * * Revision 1.10 2002/04/29 18:10:24 adam diff --git a/isamc/isamd.c b/isamc/isamd.c index 8fb7dca..1ff4ae1 100644 --- a/isamc/isamd.c +++ b/isamc/isamd.c @@ -1,4 +1,4 @@ -/* $Id: isamd.c,v 1.23 2002-08-02 19:26:56 adam Exp $ +/* $Id: isamd.c,v 1.24 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -620,7 +620,7 @@ ISAMD_PP isamd_pp_open (ISAMD is, const char *dictbuf, int dictlen) pp->diffinfo=0; pp->decodeClientData = (*is->method->code_start)(ISAMD_DECODE); - dictnum=*dictbuf; // numkeys for internals, 0 for externals + dictnum=*dictbuf; /* numkeys for internals, 0 for externals */ if (0==dictnum) { @@ -881,7 +881,10 @@ void isamd_pp_dump (ISAMD is, ISAMD_P ipos) /* * $Log: isamd.c,v $ - * Revision 1.23 2002-08-02 19:26:56 adam + * Revision 1.24 2002-11-26 22:18:34 adam + * Remove // comments + * + * Revision 1.23 2002/08/02 19:26:56 adam * Towards GPL * * Revision 1.22 2002/07/12 18:12:21 heikki diff --git a/isamc/merge-d.c b/isamc/merge-d.c index d73a459..e72d334 100644 --- a/isamc/merge-d.c +++ b/isamc/merge-d.c @@ -1,4 +1,4 @@ -/* $Id: merge-d.c,v 1.28 2002-08-02 19:26:56 adam Exp $ +/* $Id: merge-d.c,v 1.29 2002-11-26 22:18:34 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -43,11 +43,11 @@ struct ISAMD_DIFF_s { int difftype; }; -#define DT_NONE 0 // no diff, marks end of sequence -#define DT_DIFF 1 // ordinarry diff -#define DT_MAIN 2 // main data -#define DT_INPU 3 // input data to be merged -#define DT_DONE 4 // done with all input here +#define DT_NONE 0 /* no diff, marks end of sequence */ +#define DT_DIFF 1 /* ordinarry diff */ +#define DT_MAIN 2 /* main data */ +#define DT_INPU 3 /* input data to be merged */ +#define DT_DONE 4 /* done with all input here */ @@ -374,7 +374,7 @@ static void getDiffInfo(ISAMD_PP pp ) if (0==pp->diffinfo[i].maxidx) { - if (pp->is->method->debug > 5) //!!! 4 + if (pp->is->method->debug > 5) /* !!! 4 */ logf(LOG_LOG,"isamd_getDiffInfo:End mark at ix=%d n=%d", diffidx, i); return; /* end marker */ @@ -514,7 +514,7 @@ int isamd_read_item_merge ( ; /* find last diff */ if (p_key) { /* we have an extra item to inject into the merge */ - if (pp->is->method->debug >9) //!!!!! + if (pp->is->method->debug >9) /* !!!!! */ logf(LOG_LOG,"isamd_read_item: going to merge with %d.%d", p_key->sysno, p_key->seqno); pp->diffinfo[i].key = *p_key; /* the key merge could not handle */ @@ -737,8 +737,6 @@ static int merge ( ISAMD_PP firstpp, /* first pp (with diffs) */ /* set up diffs as they should be for reading */ diffidx = ISAMD_BLOCK_OFFSET_1; - //readpp->diffbuf=readpp->buf; // diffinfo has to duplicate it! - //getDiffInfo(readpp); // first read will make the diffinfo, at init if (readpp->is->method->debug >4) logf(LOG_LOG,"isamd_merge: f=%d=%d:%d n=%d=%d:%d", @@ -805,9 +803,6 @@ static int merge ( ISAMD_PP firstpp, /* first pp (with diffs) */ } /* while read */ -// firstpp->diffs=0; - - isamd_reduceblock(pp); /* reduce size if possible */ if (0==firstpp->next) firstpp->next = isamd_addr(pp->pos,pp->cat); @@ -907,7 +902,6 @@ static int append_diffs( diffidx+=sizeof(int); /* difflen will be stored here */ /* read first input */ - //i_ptr = i_item; //!!! i_more = filter_read(filt, &i_key, &i_mode); /* i_more = (*data->read_item)(data->clientData, &i_ptr, &i_mode); */ @@ -954,7 +948,7 @@ static int append_diffs( { /* max size - can't help, need to merge it */ if (is->method->debug >7) logf(LOG_LOG,"isamd_appd: need to merge"); - if (is->method->debug >9) //!!!!! + if (is->method->debug >9) /* !!!!! */ logf(LOG_LOG,"isamd_appd: going to merge with m=%d %d.%d", i_mode, i_key.sysno, i_key.seqno); merge_rc = merge (firstpp, &i_key, filt, dictentry, dictlen); @@ -1103,7 +1097,10 @@ int isamd_append (ISAMD is, char *dictentry, int dictlen, ISAMD_I data) /* * $Log: merge-d.c,v $ - * Revision 1.28 2002-08-02 19:26:56 adam + * Revision 1.29 2002-11-26 22:18:34 adam + * Remove // comments + * + * Revision 1.28 2002/08/02 19:26:56 adam * Towards GPL * * Revision 1.27 2002/07/12 18:12:21 heikki -- 1.7.10.4