cm fetchstore should dereference unset ops

[openafs.git] / src / afs / afs_fetchstore.c

diff --git a/src/afs/afs_fetchstore.c b/src/afs/afs_fetchstore.c
index 5e61355..6f2f354 100644 (file)
--- a/src/afs/afs_fetchstore.c
+++ b/src/afs/afs_fetchstore.c
@@ -529,7 +529,8 @@ afs_CacheStoreDCaches(struct vcache *avc, struct dcache **dclist,
        }
        XSTATS_END_TIME;
     }
-    code = (*ops->destroy)(&rock, code);
+    if (ops)
+       code = (*ops->destroy)(&rock, code);
     return code;
 }
 
@@ -561,7 +562,6 @@ afs_CacheStoreVCache(struct dcache **dcList, struct vcache *avc,
     void * rock = NULL;
     unsigned int i, j;
 
-    struct AFSStoreStatus InStatus;
     struct AFSFetchStatus OutStatus;
     int doProcessFS = 0;
     afs_size_t base, bytes, length;
@@ -839,8 +839,7 @@ afs_int32
 rxfs_fetchMore(void *r, afs_uint32 *length, afs_uint32 *moredata)
 {
     afs_int32 code;
-    register struct rxfs_fetchVariables *v
-           = (struct rxfs_fetchVariables *)r;
+    struct rxfs_fetchVariables *v = (struct rxfs_fetchVariables *)r;
 
     /*
      * The fetch protocol is extended for the AFS/DFS translator
@@ -884,7 +883,7 @@ struct fetchOps rxfs_fetchMemOps = {
 };
 
 afs_int32
-rxfs_fetchInit(register struct afs_conn *tc, struct vcache *avc,afs_offs_t base,
+rxfs_fetchInit(struct afs_conn *tc, struct vcache *avc, afs_offs_t base,
                afs_uint32 size, afs_uint32 *alength, afs_uint32 *moredata,
                struct dcache *adc,
                struct osi_file *fP, struct fetchOps **ops, void **rock)
@@ -1046,19 +1045,17 @@ rxfs_fetchInit(register struct afs_conn *tc, struct vcache *avc,afs_offs_t base,
  * \note Environment: Nothing interesting.
  */
 int
-afs_CacheFetchProc(register struct afs_conn *tc,
-                   register struct osi_file *fP, afs_size_t base,
-                   struct dcache *adc, struct vcache *avc,
-                   afs_int32 size,
+afs_CacheFetchProc(struct afs_conn *tc, struct osi_file *fP, afs_size_t base,
+                   struct dcache *adc, struct vcache *avc, afs_int32 size,
                    struct afs_FetchOutput *tsmall)
 {
-    register afs_int32 code;
+    afs_int32 code;
     afs_uint32 length;
     afs_uint32 bytesread, byteswritten;
     struct fetchOps *ops = NULL;
     void *rock = NULL;
     int moredata = 0;
-    register int offset = 0;
+    int offset = 0;
 
     XSTATS_DECLS;
 #ifndef AFS_NOSTATS
@@ -1133,7 +1130,8 @@ afs_CacheFetchProc(register struct afs_conn *tc,
     } while (moredata);
     if (!code)
        code = (*ops->close)(rock, avc, adc, tsmall);
-    (*ops->destroy)(&rock, code);
+    if (ops)
+       (*ops->destroy)(&rock, code);
 
 #ifndef AFS_NOSTATS
     FillStoreStats(code, AFS_STATS_FS_XFERIDX_FETCHDATA, &xferStartTime,