Skip to content

Commit 5fce006

Browse files
TheAssembler1TheAssembler1
committed
Merge branch 'tests_logging' of https://github.com/TheAssembler1/pdc into tests_logging
2 parents a8d56eb + f76f502 commit 5fce006

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

‎src/api/pdc_obj/include/pdc_cont.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ typedef struct _pdc_id_info cont_handle;
3333
/* Library Public Struct */
3434
/**************************/
3535
struct pdc_cont_info {
36-
char *name;
36+
char * name;
3737
pdcid_t local_id;
3838
uint64_t meta_id;
3939
};

‎src/api/pdc_obj/pdc_prop.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ PDCprop_create(pdc_prop_type_t type, pdcid_t pdcid)
5757
{
5858
pdcid_t ret_value = 0;
5959
struct _pdc_cont_prop *p = NULL;
60-
struct _pdc_obj_prop *q = NULL;
61-
struct _pdc_id_info *id_info = NULL;
62-
struct _pdc_class *pdc_class;
60+
struct _pdc_obj_prop * q = NULL;
61+
struct _pdc_id_info * id_info = NULL;
62+
struct _pdc_class * pdc_class;
6363
pdcid_t new_id_c;
6464
pdcid_t new_id_o;
6565

@@ -129,7 +129,7 @@ PDCprop_obj_dup(pdcid_t prop_id)
129129
pdcid_t ret_value = 0;
130130
struct _pdc_obj_prop *q = NULL;
131131
struct _pdc_obj_prop *info = NULL;
132-
struct _pdc_id_info *prop = NULL;
132+
struct _pdc_id_info * prop = NULL;
133133
pdcid_t new_id;
134134
size_t i;
135135

@@ -288,7 +288,7 @@ PDCcont_prop_get_info(pdcid_t cont_prop)
288288
{
289289
struct _pdc_cont_prop *ret_value = NULL;
290290
struct _pdc_cont_prop *info = NULL;
291-
struct _pdc_id_info *prop;
291+
struct _pdc_id_info * prop;
292292

293293
FUNC_ENTER(NULL);
294294

@@ -317,9 +317,9 @@ PDCcont_prop_get_info(pdcid_t cont_prop)
317317
struct pdc_obj_prop *
318318
PDCobj_prop_get_info(pdcid_t obj_prop)
319319
{
320-
struct pdc_obj_prop *ret_value = NULL;
320+
struct pdc_obj_prop * ret_value = NULL;
321321
struct _pdc_obj_prop *info = NULL;
322-
struct _pdc_id_info *prop;
322+
struct _pdc_id_info * prop;
323323
size_t i;
324324

325325
FUNC_ENTER(NULL);
@@ -349,7 +349,7 @@ PDC_obj_prop_get_info(pdcid_t obj_prop)
349349
{
350350
struct _pdc_obj_prop *ret_value = NULL;
351351
struct _pdc_obj_prop *info = NULL;
352-
struct _pdc_id_info *prop;
352+
struct _pdc_id_info * prop;
353353
size_t i;
354354

355355
FUNC_ENTER(NULL);

‎src/tests/cont/cont_add_del.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ main(int argc, char **argv)
8080
char obj_prefix[4][10] = {"x", "y", "z", "energy"};
8181
char tmp_str[128];
8282
char name_mode[6][32] = {"Random Obj Names", "INVALID!", "One Obj Name",
83-
"INVALID!", "INVALID!", "Four Obj Names"};
83+
"INVALID!", "INVALID!", "Four Obj Names"};
8484

8585
#ifdef ENABLE_MPI
8686
MPI_Init(&argc, &argv);

‎src/tests/dart/dart_algo_sim.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ main(int argc, char **argv)
318318
word_count = atoi(argv[7]);
319319
prefix_len = atoi(argv[8]);
320320
char **input_word_list = NULL;
321-
int *req_count = NULL;
321+
int * req_count = NULL;
322322

323323
int i = 0;
324324

@@ -346,7 +346,7 @@ main(int argc, char **argv)
346346
void (*keyword_insert[])(char *, int) = {DHT_INITIAL_keyword_insert, DHT_FULL_keyword_insert,
347347
dart_keyword_insert};
348348
int (*keyword_search[])(char *, int) = {DHT_INITIAL_keyword_search, DHT_FULL_keyword_search,
349-
dart_keyword_search};
349+
dart_keyword_search};
350350

351351
if (INPUT_TYPE == INPUT_DICTIONARY) {
352352
// Init dart space.

‎src/tests/obj/obj_buf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ main(int argc, char **argv)
3434
pdcid_t pdc, cont_prop, cont, obj_prop, obj1;
3535
int rank = 0, size = 1;
3636
int myArray[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
37-
void **rbuf;
37+
void ** rbuf;
3838
int ret_value = TSUCCEED;
3939
char cont_name[128], obj_name1[128];
4040

‎src/tests/obj/obj_iter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ main(int argc, char **argv)
3434
{
3535
pdcid_t pdc, cont_prop, cont, obj_prop, obj1, obj2, obj3;
3636
int rank = 0, size = 1;
37-
obj_handle *oh;
37+
obj_handle * oh;
3838
struct pdc_obj_info *info;
3939
int ret_value = TSUCCEED;
4040
char cont_name[128], obj_name1[128], obj_name2[128], obj_name3[128];

‎src/tests/tags/kvtag_add_get.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ main()
3535
{
3636
pdcid_t pdc, cont_prop, cont, obj_prop1, obj_prop2, obj1, obj2;
3737
pdc_kvtag_t kvtag1, kvtag2, kvtag3;
38-
char *v1 = "value1";
38+
char * v1 = "value1";
3939
int v2 = 2;
4040
double v3 = 3.45;
4141
pdc_var_type_t type1, type2, type3;
42-
void *value1, *value2, *value3;
42+
void * value1, *value2, *value3;
4343
psize_t value_size;
4444
int ret_value = SUCCEED;
4545
int rank = 0;

‎src/tests/tags/kvtag_query.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ int
8080
main(int argc, char *argv[])
8181
{
8282
pdcid_t pdc, cont_prop, cont, obj_prop;
83-
pdcid_t *obj_ids;
83+
pdcid_t * obj_ids;
8484
int n_obj, n_add_tag, my_obj, my_obj_s, my_add_tag, my_add_tag_s;
8585
int proc_num = 1, rank = 0, i, v, iter, round, selectivity, is_using_dart;
8686
char obj_name[128];
8787
double stime, total_time;
8888
pdc_kvtag_t kvtag;
89-
uint64_t *pdc_ids;
89+
uint64_t * pdc_ids;
9090
int nres, ntotal;
9191
int ret_value = SUCCEED;
9292

‎src/utils/pdc_interface.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <assert.h>
3232

3333
/* Combine a Type number and an atom index into an atom */
34-
#define PDCID_MAKE(g, i) ((((pdcid_t)(g) & TYPE_MASK) << ID_BITS) | ((pdcid_t)(i) & ID_MASK))
34+
#define PDCID_MAKE(g, i) ((((pdcid_t)(g)&TYPE_MASK) << ID_BITS) | ((pdcid_t)(i)&ID_MASK))
3535

3636
/* Variable to keep track of the number of types allocated. Its value is the
3737
* next type ID to be handed out, so it is always one greater than the number
@@ -46,7 +46,7 @@ PDC_find_id(pdcid_t idid)
4646
{
4747
struct _pdc_id_info *ret_value = NULL;
4848
PDC_type_t type;
49-
struct PDC_id_type *type_ptr;
49+
struct PDC_id_type * type_ptr;
5050

5151
FUNC_ENTER(NULL);
5252

@@ -106,7 +106,7 @@ PDC_register_type(PDC_type_t type_id, PDC_free_t free_func)
106106
pdcid_t
107107
PDC_id_register(PDC_type_t type, void *object)
108108
{
109-
struct PDC_id_type *type_ptr;
109+
struct PDC_id_type * type_ptr;
110110
struct _pdc_id_info *id_ptr;
111111
pdcid_t new_id;
112112
pdcid_t ret_value = 0;
@@ -149,7 +149,7 @@ PDC_dec_ref(pdcid_t id)
149149
{
150150
int ret_value = 0;
151151
struct _pdc_id_info *id_ptr;
152-
struct PDC_id_type *type_ptr;
152+
struct PDC_id_type * type_ptr;
153153

154154
FUNC_ENTER(NULL);
155155

@@ -188,7 +188,7 @@ PDC_find_byname(PDC_type_t type, const char *byname)
188188
{
189189
pdcid_t ret_value = 0;
190190
struct _pdc_id_info *id_ptr = NULL;
191-
struct PDC_id_type *type_ptr;
191+
struct PDC_id_type * type_ptr;
192192

193193
FUNC_ENTER(NULL);
194194

@@ -252,7 +252,7 @@ perr_t
252252
PDC_id_list_clear(PDC_type_t type)
253253
{
254254
perr_t ret_value = SUCCEED;
255-
struct PDC_id_type *type_ptr;
255+
struct PDC_id_type * type_ptr;
256256
struct _pdc_id_info *id_ptr;
257257

258258
FUNC_ENTER(NULL);

0 commit comments

Comments
 (0)