*** empty log message ***

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index c35c4365f0b00f939264e04ae70f43e1d0953a54..a5ed071037bf89c9836d14d0aa886e6ead3624ab 100644 (file)
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -104,7 +104,6 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -127,13 +126,11 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -168,7 +165,6 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -191,13 +187,11 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -232,7 +226,6 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -255,13 +248,11 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -295,7 +286,6 @@ int Param_getBlob(const Param *my, const char *name, const char *idx, size_t *si
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -318,13 +308,11 @@ int Param_getBlob(const Param *my, const char *name, const char *idx, size_t *si
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -358,7 +346,6 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -374,13 +361,11 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -414,7 +399,6 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
        } else if (status != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
                retVal = -1;
-               found = -1;
        }
 
        if((status = ca_pend_io(TIMEOUT)) != ECA_NORMAL) {
@@ -430,13 +414,11 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
                        Param_strerror((Param *) my, ca_message(status));
                } else if (status != ECA_NORMAL) {
                        Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
                }
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {
                Param_strerror((Param *) my, ca_message(status));
-               retVal = -1;
        }
 
        free(pPVName);
@@ -469,7 +451,6 @@ static void Param_copyStringsToAllocMem(struct event_handler_args args)
        } else {
                Param_strerror((Param *) result->my, ca_message(args.status));
                *(result->rows) = 0;
-               *(result->retVal) = -1;
        }
 }
 
@@ -489,7 +470,6 @@ static void Param_copyIntsToAllocMem(struct event_handler_args args)
        } else {
                Param_strerror((Param *) result->my, ca_message(args.status));
                *(result->rows) = 0;
-               *(result->retVal) = -1;
        }
 }
 
@@ -500,22 +480,11 @@ static void Param_copyBlobToAllocMem(struct event_handler_args args)
        
        *(result->size) = args.count;
        if(args.type == DBR_LONG && args.status == ECA_NORMAL) {
-#if 0
-               FILE *reference;
-#endif
-               fprintf(stderr, "Seems to be the right type of data.\n");
-               fprintf(stderr, "%d blocks of each %d bytes length read.\n", *(result->size), sizeof(dbr_long_t));
-#if 0
-               reference = fopen("xx", "w+b");
-               fwrite(buffer, sizeof(dbr_long_t), *(result->size), reference);
-               fclose(reference);
-#endif
                fwrite(buffer, sizeof(dbr_long_t), *(result->size), *result->val);
                rewind(*result->val);
        } else {
                Param_strerror((Param *) result->my, ca_message(args.status));
                *(result->size) = 0;
-               *(result->retVal) = -1;
        }
 }