Просмотр исходного кода

db_perlvdb: added const specifiers to get rid of warnings

Daniel-Constantin Mierla 7 лет назад
Родитель
Сommit
6a152024a4

+ 6 - 6
src/modules/db_perlvdb/perlvdb_conv.c

@@ -33,7 +33,7 @@
 /* Converts a set of pairs to perl SVs.
 /* Converts a set of pairs to perl SVs.
  * For insert, and update (second half)
  * For insert, and update (second half)
  */
  */
-AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) {
+AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n) {
 
 
 	AV *array = newAV();
 	AV *array = newAV();
 	SV *element;
 	SV *element;
@@ -50,7 +50,7 @@ AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) {
 /* Converts a set of cond's to perl SVs.
 /* Converts a set of cond's to perl SVs.
  * For delete, update (first half), query
  * For delete, update (first half), query
  */
  */
-AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) {
+AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n) {
 	AV *array = newAV();
 	AV *array = newAV();
 	SV *element = NULL;
 	SV *element = NULL;
 	int i = 0;
 	int i = 0;
@@ -80,7 +80,7 @@ AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) {
 /* Converts a set of key names to a perl array.
 /* Converts a set of key names to a perl array.
  * Needed in query.
  * Needed in query.
  */
  */
-AV *keys2perlarray(db_key_t* keys, int n) {
+AV *keys2perlarray(const db_key_t* keys, const int n) {
 	AV *array = newAV();
 	AV *array = newAV();
 	SV *element;
 	SV *element;
 	int i;
 	int i;
@@ -92,7 +92,7 @@ AV *keys2perlarray(db_key_t* keys, int n) {
 	return array;
 	return array;
 }
 }
 
 
-SV *valdata(db_val_t* val) {
+SV *valdata(const db_val_t* val) {
 	SV *data = &PL_sv_undef;
 	SV *data = &PL_sv_undef;
 	const char* stringval;
 	const char* stringval;
 
 
@@ -167,7 +167,7 @@ SV *val2perlval(db_val_t* val) {
 
 
 }
 }
 
 
-SV *pair2perlpair(db_key_t key, db_val_t* val) {
+SV *pair2perlpair(db_key_t key, const db_val_t* val) {
 	SV* retval;
 	SV* retval;
 	SV *class;
 	SV *class;
 
 
@@ -190,7 +190,7 @@ SV *pair2perlpair(db_key_t key, db_val_t* val) {
 	
 	
 }
 }
 
 
-SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val) {
+SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val) {
 	SV* retval;
 	SV* retval;
 	SV *class;
 	SV *class;
 	
 	

+ 5 - 5
src/modules/db_perlvdb/perlvdb_conv.h

@@ -44,21 +44,21 @@
 /* Converts a set of pairs to perl SVs.
 /* Converts a set of pairs to perl SVs.
  * For insert, and update (second half)
  * For insert, and update (second half)
  */
  */
-AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n);
+AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n);
 
 
 /* Converts a set of cond's to perl SVs.
 /* Converts a set of cond's to perl SVs.
  * For delete, update (first half), query
  * For delete, update (first half), query
  */
  */
-AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n);
+AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n);
 
 
 /* Converts a set of key names to a perl array.
 /* Converts a set of key names to a perl array.
  * Needed in query.
  * Needed in query.
  */
  */
-AV *keys2perlarray(db_key_t* keys, int n);
+AV *keys2perlarray(const db_key_t* keys, const int n);
 
 
 SV *val2perlval(db_val_t* val);
 SV *val2perlval(db_val_t* val);
-SV *pair2perlpair(db_key_t key, db_val_t* val);
-SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val);
+SV *pair2perlpair(db_key_t key, const db_val_t* val);
+SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val);
 
 
 int perlresult2dbres(SV *perlres, db1_res_t **r);
 int perlresult2dbres(SV *perlres, db1_res_t **r);
 
 

+ 3 - 3
src/modules/db_perlvdb/perlvdbfunc.c

@@ -76,7 +76,7 @@ SV *newvdbobj(const char* cn) {
 	return obj;
 	return obj;
 }
 }
 
 
-SV *getobj(db1_con_t *con) {
+SV *getobj(const db1_con_t *con) {
 	return ((SV*)CON_TAIL(con));
 	return ((SV*)CON_TAIL(con));
 }
 }
 
 
@@ -179,8 +179,8 @@ void perlvdb_db_close(db1_con_t* h) {
  * v: values of the keys
  * v: values of the keys
  * n: number of key=value pairs
  * n: number of key=value pairs
  */
  */
-int perlvdb_db_insertreplace(db1_con_t* h, db_key_t* k, db_val_t* v,
-		int n, char *insertreplace) {
+int perlvdb_db_insertreplace(const db1_con_t* h, const db_key_t* k, const db_val_t* v,
+		const int n, char *insertreplace) {
 	AV *arr;
 	AV *arr;
 	SV *arrref;
 	SV *arrref;
 	SV *ret;
 	SV *ret;