IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 24, 2010, 11:22:25 AM (16 years ago)
Author:
eugene
Message:

large update merging in changes for Ohana to support large files

Location:
trunk/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/libfits/header/F_H_field.c

    r21059 r27435  
    66
    77  char *buf;
    8   int i, Nwant, Nfound;
     8  off_t i;
     9  int Nwant, Nfound;
    910  char keyword[10];
     11
     12  if (header[0].buffer == NULL) return NULL;
    1013
    1114  /* create a blank-padded keyword with exactly 8 characters */
    … …  
    1922    /* find the Nth entry */
    2023    Nfound = 0;
    21     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     24    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    2225      if (!strncmp (keyword, buf, 8)) {
    2326        Nfound ++;
    … …  
    3033    /* count the entries */
    3134    Nfound = 0;
    32     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     35    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    3336      if (!strncmp (keyword, buf, 8)) {
    3437        Nfound ++;
    … …  
    4144    /* find the Nwant entry */
    4245    Nfound = 0;
    43     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     46    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    4447      if (!strncmp (keyword, buf, 8)) {
    4548        Nfound ++;
    … …  
    5053  }
    5154
    52   return ((char *) NULL);
     55  return NULL;
    5356
    5457/*
    … …  
    6669
    6770  char *buf, *ptr;
    68   int i, Nwant, Nfound, Nfield;
     71  off_t i;
     72  int Nwant, Nfound, Nfield;
     73
     74  if (header[0].buffer == NULL) return NULL;
    6975
    7076  Nfield = strlen (field);
    … …  
    7682  if (N > 0) {
    7783    Nfound = 0;
    78     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     84    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    7985      // have we found a HIERARCH entry?
    8086      if (strncmp ("HIERARCH", buf, 8)) continue;
    … …  
    9096    /* count the entries */
    9197    Nfound = 0;
    92     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     98    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    9399      if (strncmp ("HIERARCH", buf, 8)) continue;
    94100      ptr = buf + 9; // start of following keyword
    … …  
    102108    /* find the Nwant entry */
    103109    Nfound = 0;
    104     for (i = 0; i < header[0].size; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
     110    for (i = 0; i < header[0].datasize; i+= FT_LINE_LENGTH, buf += FT_LINE_LENGTH) {
    105111      if (strncmp ("HIERARCH", buf, 8)) continue;
    106112      ptr = buf + 9; // start of following keyword
    … …  
    111117  }
    112118
    113   return ((char *) NULL);
     119  return NULL;
    114120
    115121/*
    … …  
    122128
    123129/*********************** fits header field ****************************/
    124 char *gfits_header_lineno (Header *header, int N) {
     130char *gfits_header_lineno (Header *header, off_t N) {
    125131
    126132  char *buf;
    127133
    128   if (N*80 >= header[0].size) return NULL;
     134  if (N*80 >= header[0].datasize) return NULL;
    129135
    130136  buf = &header[0].buffer[N*80];
Note: See TracChangeset for help on using the changeset viewer.