X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjpip%2Fcache_manager.c;h=db3a8b533ccc5e3ac2d2b1cd6c1b5a5b69bdf14a;hb=aaff099b49365cfecfc475ada48b9244c6eefc9c;hp=ce8e012a3d0ee0fdca5e705d4abe08b3e233fabc;hpb=cffc33a51c7a9f4b8cf460fdc7c02639b40d266d;p=openjpeg.git

diff --git a/src/lib/openjpip/cache_manager.c b/src/lib/openjpip/cache_manager.c
index ce8e012a..db3a8b53 100644
--- a/src/lib/openjpip/cache_manager.c
+++ b/src/lib/openjpip/cache_manager.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
@@ -35,241 +35,260 @@
 
 cachelist_param_t * gene_cachelist(void)
 {
-  cachelist_param_t *cachelist;
-  
-  cachelist = (cachelist_param_t *)malloc( sizeof(cachelist_param_t));
-  
-  cachelist->first = NULL;
-  cachelist->last  = NULL;
-
-  return cachelist;
+    cachelist_param_t *cachelist;
+
+    cachelist = (cachelist_param_t *)malloc(sizeof(cachelist_param_t));
+
+    cachelist->first = NULL;
+    cachelist->last  = NULL;
+
+    return cachelist;
 }
 
 void delete_cachelist(cachelist_param_t **cachelist)
 {
-  cache_param_t *cachePtr, *cacheNext;
-  
-  cachePtr = (*cachelist)->first;
-  while( cachePtr != NULL){
-    cacheNext=cachePtr->next;
-    delete_cache( &cachePtr);
-    cachePtr=cacheNext;
-  }
-  free( *cachelist);
+    cache_param_t *cachePtr, *cacheNext;
+
+    cachePtr = (*cachelist)->first;
+    while (cachePtr != NULL) {
+        cacheNext = cachePtr->next;
+        delete_cache(&cachePtr);
+        cachePtr = cacheNext;
+    }
+    free(*cachelist);
 }
 
-cache_param_t * gene_cache( const char *targetname, int csn, char *tid, char *cid)
+cache_param_t * gene_cache(const char *targetname, int csn, char *tid,
+                           char *cid)
 {
-  cache_param_t *cache;
-  
-  cache = (cache_param_t *)malloc( sizeof(cache_param_t));
-  cache->filename = strdup( targetname);
-  cache->tid = strdup( tid);
-  cache->csn = csn;
-  cache->cid = (char **)malloc( sizeof(char *));
-  *cache->cid = strdup( cid);
-  cache->numOfcid = 1;
+    cache_param_t *cache;
+
+    cache = (cache_param_t *)malloc(sizeof(cache_param_t));
+    cache->filename = strdup(targetname);
+    cache->tid = strdup(tid);
+    cache->csn = csn;
+    cache->cid = (char **)malloc(sizeof(char *));
+    *cache->cid = strdup(cid);
+    cache->numOfcid = 1;
 #if 1
-  cache->metadatalist = NULL;
+    cache->metadatalist = NULL;
 #else
-  cache->metadatalist = gene_metadatalist();
+    cache->metadatalist = gene_metadatalist();
 #endif
-  cache->ihdrbox = NULL;
-  cache->next = NULL;
+    cache->ihdrbox = NULL;
+    cache->next = NULL;
 
-  return cache;
+    return cache;
 }
 
-void delete_cache( cache_param_t **cache)
+void delete_cache(cache_param_t **cache)
 {
-  int i;
-  
-  free( (*cache)->filename);
-  free( (*cache)->tid);
-
-  delete_metadatalist( &(*cache)->metadatalist);
-
-  if((*cache)->ihdrbox)
-    free((*cache)->ihdrbox);
-  for( i=0; i<(*cache)->numOfcid; i++)
-    free( (*cache)->cid[i]);
-  free( (*cache)->cid);
-  free( *cache);
+    int i;
+
+    free((*cache)->filename);
+    free((*cache)->tid);
+
+    delete_metadatalist(&(*cache)->metadatalist);
+
+    if ((*cache)->ihdrbox) {
+        free((*cache)->ihdrbox);
+    }
+    for (i = 0; i < (*cache)->numOfcid; i++) {
+        free((*cache)->cid[i]);
+    }
+    free((*cache)->cid);
+    free(*cache);
 }
 
-void insert_cache_into_list( cache_param_t *cache, cachelist_param_t *cachelist)
+void insert_cache_into_list(cache_param_t *cache, cachelist_param_t *cachelist)
 {
-  if( cachelist->first)
-    cachelist->last->next = cache;
-  else
-    cachelist->first = cache;
-  cachelist->last = cache;
+    if (cachelist->first) {
+        cachelist->last->next = cache;
+    } else {
+        cachelist->first = cache;
+    }
+    cachelist->last = cache;
 }
 
-cache_param_t * search_cache( const char targetname[], cachelist_param_t *cachelist)
+cache_param_t * search_cache(const char targetname[],
+                             cachelist_param_t *cachelist)
 {
-  cache_param_t *foundcache;
+    cache_param_t *foundcache;
 
-  if( !targetname)
-    return NULL;
+    if (!targetname) {
+        return NULL;
+    }
 
-  foundcache = cachelist->first;
-  
-  while( foundcache != NULL){
-    
-    if( strcmp( targetname, foundcache->filename) == 0)
-      return foundcache;
-      
-    foundcache = foundcache->next;
-  }
-  return NULL;
+    foundcache = cachelist->first;
+
+    while (foundcache != NULL) {
+
+        if (strcmp(targetname, foundcache->filename) == 0) {
+            return foundcache;
+        }
+
+        foundcache = foundcache->next;
+    }
+    return NULL;
 }
 
-cache_param_t * search_cacheBycsn( int csn, cachelist_param_t *cachelist)
+cache_param_t * search_cacheBycsn(int csn, cachelist_param_t *cachelist)
 {
-  cache_param_t *foundcache;
-
-  foundcache = cachelist->first;
-  
-  while( foundcache != NULL){
-    
-    if(  csn == foundcache->csn)
-      return foundcache;
-    foundcache = foundcache->next;
-  }
-  return NULL;
+    cache_param_t *foundcache;
+
+    foundcache = cachelist->first;
+
+    while (foundcache != NULL) {
+
+        if (csn == foundcache->csn) {
+            return foundcache;
+        }
+        foundcache = foundcache->next;
+    }
+    return NULL;
 }
 
-cache_param_t * search_cacheBycid( const char cid[], cachelist_param_t *cachelist)
+cache_param_t * search_cacheBycid(const char cid[],
+                                  cachelist_param_t *cachelist)
 {
-  cache_param_t *foundcache;
-  int i;
+    cache_param_t *foundcache;
+    int i;
 
-  if( !cid)
-    return NULL;
+    if (!cid) {
+        return NULL;
+    }
 
-  foundcache = cachelist->first;
-  
-  while( foundcache != NULL){
-    for( i=0; i<foundcache->numOfcid; i++)
-      if( strcmp( cid, foundcache->cid[i]) == 0)
-	return foundcache;
-    foundcache = foundcache->next;
-  }
-  return NULL;
+    foundcache = cachelist->first;
+
+    while (foundcache != NULL) {
+        for (i = 0; i < foundcache->numOfcid; i++)
+            if (strcmp(cid, foundcache->cid[i]) == 0) {
+                return foundcache;
+            }
+        foundcache = foundcache->next;
+    }
+    return NULL;
 }
 
-cache_param_t * search_cacheBytid( const char tid[], cachelist_param_t *cachelist)
+cache_param_t * search_cacheBytid(const char tid[],
+                                  cachelist_param_t *cachelist)
 {
-  cache_param_t *foundcache;
+    cache_param_t *foundcache;
 
-  if( !tid)
-    return NULL;
+    if (!tid) {
+        return NULL;
+    }
+
+    foundcache = cachelist->first;
 
-  foundcache = cachelist->first;
-  
-  while( foundcache != NULL){
-    if( strcmp( tid, foundcache->tid) == 0)
-      return foundcache;
-    foundcache = foundcache->next;
-  }
-  return NULL;
+    while (foundcache != NULL) {
+        if (strcmp(tid, foundcache->tid) == 0) {
+            return foundcache;
+        }
+        foundcache = foundcache->next;
+    }
+    return NULL;
 }
 
-void add_cachecid( const char *cid, cache_param_t *cache)
+void add_cachecid(const char *cid, cache_param_t *cache)
 {
-  if( !cid)
-    return;
-  
-  if( (cache->cid = realloc( cache->cid, (OPJ_SIZE_T)(cache->numOfcid+1)*sizeof(char *))) == NULL){
-    fprintf( stderr, "failed to add new cid to cache table in add_cachecid()\n");
-    return;
-  }
-  
-  cache->cid[ cache->numOfcid] = strdup( cid);
-
-  cache->numOfcid ++;
+    if (!cid) {
+        return;
+    }
+
+    if ((cache->cid = realloc(cache->cid,
+                              (OPJ_SIZE_T)(cache->numOfcid + 1) * sizeof(char *))) == NULL) {
+        fprintf(stderr, "failed to add new cid to cache table in add_cachecid()\n");
+        return;
+    }
+
+    cache->cid[ cache->numOfcid] = strdup(cid);
+
+    cache->numOfcid ++;
 }
 
-void update_cachetid( const char *tid, cache_param_t *cache)
+void update_cachetid(const char *tid, cache_param_t *cache)
 {
-  if( !tid)
-    return;
-
-  if( tid[0] != '0' && strcmp( tid, cache->tid) !=0){
-    fprintf( stderr, "tid is updated to %s for %s\n", tid, cache->filename);
-    free( cache->tid);
-    cache->tid = strdup( tid);
-  }
+    if (!tid) {
+        return;
+    }
+
+    if (tid[0] != '0' && strcmp(tid, cache->tid) != 0) {
+        fprintf(stderr, "tid is updated to %s for %s\n", tid, cache->filename);
+        free(cache->tid);
+        cache->tid = strdup(tid);
+    }
 }
 
-void remove_cidInCache( const char *cid, cache_param_t *cache);
+void remove_cidInCache(const char *cid, cache_param_t *cache);
 
-void remove_cachecid( const char *cid, cachelist_param_t *cachelist)
+void remove_cachecid(const char *cid, cachelist_param_t *cachelist)
 {
-  cache_param_t *cache;
+    cache_param_t *cache;
 
-  cache = search_cacheBycid( cid, cachelist);
-  remove_cidInCache( cid, cache);
+    cache = search_cacheBycid(cid, cachelist);
+    remove_cidInCache(cid, cache);
 }
 
-void remove_cidInCache( const char *cid, cache_param_t *cache)
+void remove_cidInCache(const char *cid, cache_param_t *cache)
 {
-  int idx = -1;
-  char **tmp;
-  int i, j;
-
-  for( i=0; i<cache->numOfcid; i++)
-    if( strcmp( cid, cache->cid[i]) == 0){
-      idx = i;
-      break;
+    int idx = -1;
+    char **tmp;
+    int i, j;
+
+    for (i = 0; i < cache->numOfcid; i++)
+        if (strcmp(cid, cache->cid[i]) == 0) {
+            idx = i;
+            break;
+        }
+
+    if (idx == -1) {
+        fprintf(stderr, "cid: %s not found\n", cid);
+        return;
     }
 
-  if( idx == -1){
-    fprintf( stderr, "cid: %s not found\n", cid);
-    return;   
-  }
-  
-  tmp = cache->cid;
-
-  cache->cid = (char **)malloc( (OPJ_SIZE_T)(cache->numOfcid-1)*sizeof(char *));
-  
-  for( i=0, j=0; i<cache->numOfcid; i++){
-    if( i != idx){
-      cache->cid[j] = strdup( tmp[i]);
-      j++;
+    tmp = cache->cid;
+
+    cache->cid = (char **)malloc((OPJ_SIZE_T)(cache->numOfcid - 1) * sizeof(
+                                     char *));
+
+    for (i = 0, j = 0; i < cache->numOfcid; i++) {
+        if (i != idx) {
+            cache->cid[j] = strdup(tmp[i]);
+            j++;
+        }
+        free(tmp[i]);
     }
-    free( tmp[i]);
-  }
-  free( tmp);
+    free(tmp);
 
-  cache->numOfcid --;
+    cache->numOfcid --;
 }
 
-void print_cache( cache_param_t *cache)
+void print_cache(cache_param_t *cache)
 {
-  int i;
-  
-  fprintf( stdout,"cache\n");
-  fprintf( stdout,"\t filename: %s\n", cache->filename);
-  fprintf( stdout,"\t tid: %s\n", cache->tid);
-  fprintf( stdout,"\t csn: %d\n", cache->csn);
-  fprintf( stdout,"\t cid:");
-
-  for( i=0; i<cache->numOfcid; i++)
-    fprintf( stdout," %s", cache->cid[i]);
-  fprintf( stdout,"\n");
+    int i;
+
+    fprintf(stdout, "cache\n");
+    fprintf(stdout, "\t filename: %s\n", cache->filename);
+    fprintf(stdout, "\t tid: %s\n", cache->tid);
+    fprintf(stdout, "\t csn: %d\n", cache->csn);
+    fprintf(stdout, "\t cid:");
+
+    for (i = 0; i < cache->numOfcid; i++) {
+        fprintf(stdout, " %s", cache->cid[i]);
+    }
+    fprintf(stdout, "\n");
 }
 
-void print_allcache( cachelist_param_t *cachelist)
+void print_allcache(cachelist_param_t *cachelist)
 {
-  cache_param_t *ptr;
-
-  fprintf( stdout,"cache list\n");
-  
-  ptr = cachelist->first;
-  while( ptr != NULL){
-    print_cache( ptr);
-    ptr=ptr->next;
-  }
+    cache_param_t *ptr;
+
+    fprintf(stdout, "cache list\n");
+
+    ptr = cachelist->first;
+    while (ptr != NULL) {
+        print_cache(ptr);
+        ptr = ptr->next;
+    }
 }