1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

dtinfo: Fix coverity warning related to using delete not delete []

This commit is contained in:
Peter Howkins 2018-04-23 02:20:23 +01:00
parent 22071fd62a
commit 2f634848ce
38 changed files with 75 additions and 75 deletions

View file

@ -57,14 +57,14 @@ void BitVector::setAllBitsTo(unsigned int initValue)
BitVector::~BitVector() BitVector::~BitVector()
{ {
delete f_array; delete [] f_array;
delete f_positionArray; delete f_positionArray;
} }
void BitVector::setTo(BitVector& v) void BitVector::setTo(BitVector& v)
{ {
if ( f_words != v.f_words ) { if ( f_words != v.f_words ) {
delete f_array; delete [] f_array;
f_array = new unsigned int[v.f_words]; f_array = new unsigned int[v.f_words];
} }
f_bits = v.f_bits; f_bits = v.f_bits;

View file

@ -532,7 +532,7 @@ FeatureValueString::operator+(const FeatureValue& x) const
newString[len1+len2] = 0; newString[len1+len2] = 0;
FeatureValueString *z = new FeatureValueString(newString); FeatureValueString *z = new FeatureValueString(newString);
delete newString; delete [] newString;
return z; return z;
} }

View file

@ -215,8 +215,8 @@ f_bad_info_base_names(0), f_bad_info_base_paths(0), f_descriptor(des)
memcpy(y, f_bad_info_base_paths, sizeof(charPtr)*f_bad_base_array_size); memcpy(y, f_bad_info_base_paths, sizeof(charPtr)*f_bad_base_array_size);
f_bad_base_array_size *= 2; f_bad_base_array_size *= 2;
delete f_bad_info_base_names; delete [] f_bad_info_base_names;
delete f_bad_info_base_paths; delete [] f_bad_info_base_paths;
f_bad_info_base_names = x; f_bad_info_base_names = x;
f_bad_info_base_paths = y; f_bad_info_base_paths = y;

View file

@ -44,7 +44,7 @@ public: // functions
f_string = NULL; f_string = NULL;
} }
virtual ~CC_String () { delete f_string; } virtual ~CC_String () { delete [] f_string; }
CC_Boolean isNull() const { CC_Boolean isNull() const {
return( f_string[0] == '\0' ); return( f_string[0] == '\0' );

View file

@ -40,7 +40,7 @@ private:
public: public:
CC_Tokenizer(const CC_String & ); CC_Tokenizer(const CC_String & );
~CC_Tokenizer() { delete str_; } ~CC_Tokenizer() { delete [] str_; }
/* Here is an example to use the code /* Here is an example to use the code

View file

@ -100,8 +100,8 @@ imp_die::~imp_die()
x = y ; x = y ;
} }
delete hash_table; delete [] hash_table;
delete bucket_array ; delete [] bucket_array ;
} }
//********************************************************** //**********************************************************
@ -113,14 +113,14 @@ void imp_die::alloc_table(int new_H)
{ {
if ( bucket_array ) { if ( bucket_array ) {
for ( int i = 0; i<B; delete bucket_array[i++] ); for ( int i = 0; i<B; delete bucket_array[i++] );
delete bucket_array ; delete [] bucket_array ;
} }
B = new_H/2; B = new_H/2;
bucket_array = new imp_bucketPtr[B]; bucket_array = new imp_bucketPtr[B];
if ( hash_table ) { if ( hash_table ) {
delete hash_table; delete [] hash_table;
} }
hash_table = new data_tPtr[new_H]; hash_table = new data_tPtr[new_H];

View file

@ -171,7 +171,7 @@ buckets::~buckets()
for ( int i=0; i<v_no_buckets; i++ ) for ( int i=0; i<v_no_buckets; i++ )
delete v_bucket_array[i]; delete v_bucket_array[i];
delete v_bucket_array; delete [] v_bucket_array;
} }
void buckets::set_control_bit(int cb) void buckets::set_control_bit(int cb)
@ -284,10 +284,10 @@ void buckets::sort_by_size()
for ( ; j<v_no_buckets; new_bkt_array[j++] = 0 ); for ( ; j<v_no_buckets; new_bkt_array[j++] = 0 );
delete sizes; delete [] sizes;
delete links; delete [] links;
delete v_bucket_array; delete [] v_bucket_array;
v_bucket_array = new_bkt_array; v_bucket_array = new_bkt_array;
} }

View file

@ -254,7 +254,7 @@ int write_spec(buckets& bs, params& pms, buffer& mphf_buffer)
mphf_buffer.set_content_sz(fout_len); mphf_buffer.set_content_sz(fout_len);
memcpy(mphf_buffer.get_base(), fout.str().c_str(), fout_len); memcpy(mphf_buffer.get_base(), fout.str().c_str(), fout_len);
delete c_array; delete [] c_array;
return 0; return 0;
} }
@ -350,7 +350,7 @@ debug(cerr, k+1);
cerr << "=======\n"; cerr << "=======\n";
*/ */
delete y; delete [] y;
return 0; return 0;
} }

View file

@ -64,9 +64,9 @@ v_no_slots(params_ptr.v_n), v_num_filled_slots(0)
mphf_hash_table::~mphf_hash_table() mphf_hash_table::~mphf_hash_table()
{ {
delete v_rep ; delete [] v_rep ;
delete v_random_table ; delete [] v_random_table ;
delete v_map_table ; delete [] v_map_table ;
} }
void mphf_hash_table::clear() void mphf_hash_table::clear()

View file

@ -58,7 +58,7 @@ int_pattern::int_pattern(int i): v_rep_size(i), v_count(0)
int_pattern::~int_pattern() int_pattern::~int_pattern()
{ {
delete v_rep; delete [] v_rep;
} }
int int_pattern::duplicate() int int_pattern::duplicate()

View file

@ -111,7 +111,7 @@ sorter::~sorter()
delete v_bucket_array; delete v_bucket_array;
for ( i=0; i<v_no_unique_keys; delete v_unique_keys[i++] ); for ( i=0; i<v_no_unique_keys; delete v_unique_keys[i++] );
delete v_unique_keys; delete [] v_unique_keys;
} }
void sorter::filter_by_hash() void sorter::filter_by_hash()
@ -137,10 +137,10 @@ void sorter::filter_by_hash()
filter_a_bucket(v_bucket_array[i]); filter_a_bucket(v_bucket_array[i]);
} }
delete v_map_table; delete [] v_map_table;
delete v_check_table; delete [] v_check_table;
delete v_index_table; delete [] v_index_table;
delete v_dup_table; delete [] v_dup_table;
} }
void sorter::filter_a_bucket(bucketPtr bkt) void sorter::filter_a_bucket(bucketPtr bkt)

View file

@ -138,7 +138,7 @@ void oid_list::init_data_member(int leng)
//debug(cerr, (void*)this); //debug(cerr, (void*)this);
//debug(cerr, (void*)list_ptr.p); //debug(cerr, (void*)list_ptr.p);
delete ptr; delete [] ptr;
v_sz = leng; v_sz = leng;
set_mode(UPDATE, true); set_mode(UPDATE, true);
} }
@ -188,7 +188,7 @@ debug(cerr, int(&list_ptr.loc));
storage_ptr -> appendString(list_ptr.loc, ptr, total_char_leng); storage_ptr -> appendString(list_ptr.loc, ptr, total_char_leng);
} }
delete ptr; delete [] ptr;
ok = true; ok = true;

View file

@ -139,7 +139,7 @@ DtMmdbGetBookCaseByLocs(int infolib_descriptor, const char** locators,
for ( int i=0; i<count; i++ ) for ( int i=0; i<count; i++ )
ds[i] = bases[i] -> index_id(); ds[i] = bases[i] -> index_id();
delete bases; delete [] bases;
if (count_ptr) *count_ptr = count; if (count_ptr) *count_ptr = count;

View file

@ -72,8 +72,8 @@ OLIAS_DB::~OLIAS_DB()
delete x; delete x;
} }
delete info_base_set_names; delete [] info_base_set_names;
delete info_base_list_names; delete [] info_base_list_names;
} }
int OLIAS_DB::validInfoLibPath(const char* path) int OLIAS_DB::validInfoLibPath(const char* path)

View file

@ -192,7 +192,7 @@ user_base::checking_status_t user_base::check_lock()
) { ) {
if ( ai_info ) { if ( ai_info ) {
debug(cerr, ai_info); debug(cerr, ai_info);
delete ai_info; delete [] ai_info;
} }
return user_base::RLOCK_FAIL; return user_base::RLOCK_FAIL;
} else } else
@ -220,7 +220,7 @@ user_base::checking_status_t user_base::check_lock()
// return ok; // return ok;
// } // }
delete ai_info; delete [] ai_info;
} }
return user_base::WLOCK_FAIL; return user_base::WLOCK_FAIL;
} else { } else {

View file

@ -215,7 +215,7 @@ container_desc::init_index_array(object_dict& dict,
index_array[pos] = tmp_index_array[ind]; index_array[pos] = tmp_index_array[ind];
} }
delete tmp_index_array; delete [] tmp_index_array;
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

View file

@ -156,7 +156,7 @@ desc* object_dict::init_a_base(char* db_path, char* db_name)
//////////////// ////////////////
x = parse(orig); x = parse(orig);
delete buf; delete [] buf;
} }
@ -268,7 +268,7 @@ desc* object_dict::init_a_base(char* define_desc_path, char* db_path,
out.close(); out.close();
delete schema_buf; delete [] schema_buf;
return x; return x;

View file

@ -64,12 +64,12 @@ stored_object_desc::stored_object_desc(int class_code, const char* _type)
stored_object_desc::~stored_object_desc() stored_object_desc::~stored_object_desc()
{ {
delete store_nm; free(store_nm);
} }
void stored_object_desc::set_store_nm(const char* str) void stored_object_desc::set_store_nm(const char* str)
{ {
delete store_nm; free(store_nm);
store_nm = strdup(str); store_nm = strdup(str);
} }

View file

@ -118,7 +118,7 @@ debug(cerr, vector[i] -> str_offset);
binary_insert(vector, 0, vector_sz-1); binary_insert(vector, 0, vector_sz-1);
delete vector; delete [] vector;
} }
chunks_index::~chunks_index() chunks_index::~chunks_index()

View file

@ -93,7 +93,7 @@ void quit_store(page_storage** st, unsigned int ct)
for ( unsigned int i=0; i<ct; i++) { for ( unsigned int i=0; i<ct; i++) {
delete st[i]; delete st[i];
} }
delete st; delete [] st;
} }
int page_cache_test_1(int argc, char** argv) int page_cache_test_1(int argc, char** argv)

View file

@ -134,7 +134,7 @@ Boolean ostring::expand(const int new_alloc_sz, Boolean pre_zero)
if ( v_p ) { if ( v_p ) {
memcpy(new_p, v_p, v_sz); memcpy(new_p, v_p, v_sz);
delete v_p; delete [] v_p;
} }
v_p = new_p; v_p = new_p;

View file

@ -54,7 +54,7 @@ public:
ostring(const int chunk_size); ostring(const int chunk_size);
ostring(char* str, const int str_sz = -1); // -1 means take strlen(str) ostring(char* str, const int str_sz = -1); // -1 means take strlen(str)
ostring(const ostring&); ostring(const ostring&);
virtual ~ostring() { delete v_p; }; virtual ~ostring() { delete [] v_p; };
// length of the string // length of the string
int size() const { return v_sz; }; int size() const { return v_sz; };

View file

@ -53,5 +53,5 @@ void randomize::restore(buffer& scrambled)
char_swap(buf[i], buf[pos[i]]); char_swap(buf[i], buf[pos[i]]);
} }
delete pos; delete [] pos;
} }

View file

@ -234,7 +234,7 @@ Boolean write_lock(char* lock_file_path,
if ( ok == true ) { if ( ok == true ) {
delete ai_info; delete [] ai_info;
///////////////////////////////////////// /////////////////////////////////////////
// create the access info file // create the access info file
///////////////////////////////////////// /////////////////////////////////////////

View file

@ -240,7 +240,7 @@ NodeHistoryAgent::refresh_list()
// Free up memory used to make the list. // Free up memory used to make the list.
for (i = hist_list.length() - 1; i >= 0; i--) for (i = hist_list.length() - 1; i >= 0; i--)
XmStringFree (table[i]); XmStringFree (table[i]);
delete table; delete [] table;
} }

View file

@ -4668,7 +4668,7 @@ NodeWindowAgent::create_canvas_mark(_DtCvHandle canvas,
for (i = 0; i < markinfo.length(); i++) for (i = 0; i < markinfo.length(); i++)
delete segs[i]; delete segs[i];
delete segs ; delete [] segs ;
#ifdef BOOKMARK_DEBUG #ifdef BOOKMARK_DEBUG
if (status == _DtCvSTATUS_BAD) if (status == _DtCvSTATUS_BAD)

View file

@ -712,8 +712,8 @@ OutlineListView::select_end (Widget w, XEvent *event,
while (subcount > 0) while (subcount > 0)
if (selected_list[--subcount]) if (selected_list[--subcount])
SelectPos (f_item_pos + subcount + 1, False); SelectPos (f_item_pos + subcount + 1, False);
delete table; delete [] table;
delete selected_list; delete [] selected_list;
// Turn the wait cursor off if it was on. // Turn the wait cursor off if it was on.
if (wait_state) if (wait_state)
@ -787,7 +787,7 @@ OutlineListView::update_list(OutlineList *list, BitHandle handle)
Set (args); Set (args);
delete table; delete table;
delete selected_list; delete [] selected_list;
} }
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
@ -1152,7 +1152,7 @@ OutlineListView::activate (WCallback *wcb)
oe->level() + 1); oe->level() + 1);
AddItemsUnselected (table, subcount, lcs->item_position + 1); AddItemsUnselected (table, subcount, lcs->item_position + 1);
delete table; delete table;
delete sel_list; delete [] sel_list;
// Turn the wait cursor off if it was on. // Turn the wait cursor off if it was on.
if (wait_state) if (wait_state)

View file

@ -103,7 +103,7 @@ BitField::BitField(unsigned long initial_bits)
BitField::~BitField() BitField::~BitField()
{ {
delete f_words ; delete [] f_words ;
delete f_bits_in_use ; delete f_bits_in_use ;
} }
@ -123,7 +123,7 @@ BitField::check_allocation (unsigned long word)
new_use[i] = f_bits_in_use[i]; new_use[i] = f_bits_in_use[i];
} }
delete f_words; delete [] f_words;
f_words = new_words; f_words = new_words;
delete f_bits_in_use; delete f_bits_in_use;
f_bits_in_use = new_use; f_bits_in_use = new_use;
@ -169,7 +169,7 @@ BitField::get_handle()
new_words[f_num_words] = 0 ; new_words[f_num_words] = 0 ;
new_use[f_num_words] = 0 ; new_use[f_num_words] = 0 ;
delete f_words ; delete [] f_words ;
f_words = new_words ; f_words = new_words ;
delete f_bits_in_use ; delete f_bits_in_use ;
f_bits_in_use = new_use ; f_bits_in_use = new_use ;

View file

@ -233,7 +233,7 @@ StringParser::brute_force(const char* text_in, int n_of_pats,
for (i = 0; i < npat; i++) for (i = 0; i < npat; i++)
free (pat_tbl[i]); free (pat_tbl[i]);
free (pat_tbl); delete[] pat_tbl;
if (caped_text) if (caped_text)
delete[] caped_text; delete[] caped_text;

View file

@ -550,7 +550,7 @@ void BookTask::write_record(void)
snprintf(p, plen, "%s\t%s\t%s\t%s", name, loc, line, file); snprintf(p, plen, "%s\t%s\t%s\t%s", name, loc, line, file);
tablines.append(p); tablines.append(p);
delete p; delete [] p;
} }
const char *bk_title; const char *bk_title;
@ -600,7 +600,7 @@ void BookTask::reset()
delete tabLines; tabLines = new StringList(); delete tabLines; tabLines = new StringList();
delete tabFiles; tabFiles = new StringList(); delete tabFiles; tabFiles = new StringList();
delete tocLocator; tocLocator = NULL; delete [] tocLocator; tocLocator = NULL;
f_seq_no ++; f_seq_no ++;

View file

@ -154,7 +154,7 @@ DBTable::file(DB::Access access)
throw(PosixError(errno, path)); throw(PosixError(errno, path));
} }
delete path; delete [] path;
} }
} }
@ -458,7 +458,7 @@ void DBCursor::string_field(FILE *fp, char **out, int *lenOut)
if(lenOut) *lenOut = len; if(lenOut) *lenOut = len;
}else{ }else{
delete str; delete [] str;
} }
} }

View file

@ -192,7 +192,7 @@ Dispatch::file(const char *f)
} }
search_path_table->replace_file_scope( dirname ); search_path_table->replace_file_scope( dirname );
delete dirname; free(dirname);
} }
} }

View file

@ -117,7 +117,7 @@ checkTocLink( const char *toc_file_name,
} }
} }
delete ToCFileName; free(ToCFileName);
if ( flag ) { if ( flag ) {
throw(Unexpected("TOC validation failed\n")); throw(Unexpected("TOC validation failed\n"));
@ -618,7 +618,7 @@ lookahead( char * bufptr, char * currentgi, char * indpos)
} }
// otherwise the next start tag is the same as the current one, so no // otherwise the next start tag is the same as the current one, so no
// change to the indicator is needed. // change to the indicator is needed.
delete nextgi; free(nextgi);
} }
return; return;
} }
@ -654,7 +654,7 @@ parse4last( char * bufptr )
} else { } else {
lookahead(bufptr, startname, indicator); lookahead(bufptr, startname, indicator);
} }
delete startname; free(startname);
} else { } else {
// END TAG // END TAG
for ( ; *bufptr != '>'; bufptr++) { for ( ; *bufptr != '>'; bufptr++) {

View file

@ -49,16 +49,16 @@ SGMLDefn::SGMLDefn()
SGMLDefn::~SGMLDefn() SGMLDefn::~SGMLDefn()
{ {
delete sys_id; delete [] sys_id;
delete pub_id; delete [] pub_id;
delete file_name; delete [] file_name;
} }
void void
SGMLDefn::store_sys_id( char *sid ) SGMLDefn::store_sys_id( char *sid )
{ {
if ( sid ) { if ( sid ) {
delete sys_id; delete [] sys_id;
int len = strlen(sid); int len = strlen(sid);
sys_id = new char [len + 1]; sys_id = new char [len + 1];
@ -72,7 +72,7 @@ void
SGMLDefn::store_pub_id( char *pid ) SGMLDefn::store_pub_id( char *pid )
{ {
if ( pid ) { if ( pid ) {
delete pub_id; delete [] pub_id;
int len = strlen(pid); int len = strlen(pid);
pub_id = new char [len + 1]; pub_id = new char [len + 1];
@ -98,7 +98,7 @@ void
SGMLDefn::store_file_name( char *fname ) SGMLDefn::store_file_name( char *fname )
{ {
if ( fname ) { if ( fname ) {
delete file_name; delete [] file_name;
int len = strlen(fname); int len = strlen(fname);
file_name = new char [len + 1]; file_name = new char [len + 1];

View file

@ -37,7 +37,7 @@ StringList::StringList()
StringList::~StringList() StringList::~StringList()
{ {
reset(); reset();
delete items; delete [] items;
} }
void StringList::grow(size_t total) void StringList::grow(size_t total)
@ -47,7 +47,7 @@ void StringList::grow(size_t total)
if(used > 0){ if(used > 0){
memcpy(born, items, used *sizeof(items[0])); memcpy(born, items, used *sizeof(items[0]));
delete items; delete [] items;
} }
items = born; items = born;

View file

@ -146,7 +146,7 @@ write_array(FlexBuffer *buffer, const char *tokens, int quotes)
if (quotes) buffer->put( '\"' ); if (quotes) buffer->put( '\"' );
} }
} }
delete str; free(str);
} /*@# else out of memory... */ } /*@# else out of memory... */
buffer->put(']'); buffer->put(']');

View file

@ -178,7 +178,7 @@ int TOCTask::write_tree(DBTable *tbl)
INTEGER_CODE, qty, INTEGER_CODE, qty,
NULL); NULL);
delete children; delete [] children;
return qty; return qty;
} }

View file

@ -48,7 +48,7 @@ ComplexTask::~ComplexTask()
delete subtasks[i]; delete subtasks[i];
} }
if ( subtasks ) delete subtasks; if ( subtasks ) delete [] subtasks;
} }
void ComplexTask::removeAllSubTasks() void ComplexTask::removeAllSubTasks()
@ -57,7 +57,7 @@ void ComplexTask::removeAllSubTasks()
delete subtasks[i]; delete subtasks[i];
} }
if ( subtasks ) { delete subtasks; subtasks = 0; } if ( subtasks ) { delete [] subtasks; subtasks = NULL; }
used = alloc = 0; used = alloc = 0;
} }
@ -98,7 +98,7 @@ ComplexTask::grow(int needed)
if(used){ if(used){
memcpy(born, subtasks, sizeof(Task*) * used); memcpy(born, subtasks, sizeof(Task*) * used);
delete subtasks; subtasks = 0; delete [] subtasks; subtasks = NULL;
} }
subtasks = born; subtasks = born;