Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused macros from mfsd/datainfo.c #581

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Remove unused macros from mfsd/datainfo.c #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions mfhdf/libsrc/mfdatainfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,14 @@ LOCAL ROUTINES

#include "nc_priv.h"

#ifndef DATAINFO_MASTER
#define DATAINFO_MASTER
#endif
#include "mfhdf.h"
#include "mf_priv.h"

#ifdef H4_HAVE_LIBSZ /* we have the szip library */
#include "szlib.h"
#endif

#ifndef MFSD_INTERNAL
#define MFSD_INTERNAL
#endif

#ifdef MFSD_INTERNAL
/* Local function prototypes */
#include "mf_priv.h"
#endif

static intn get_attr_tag(char *attr_name, uint16 *attr_tag);

/******************************************************************************
Expand Down
26 changes: 1 addition & 25 deletions mfhdf/libsrc/mfsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ NOTE: This file needs to have the comments cleaned up for most of the

#include "mfhdf.h"
#include "hfile_priv.h"
#include "mf_priv.h"

#ifdef H4_HAVE_LIBSZ /* we have the szip library */
#include "szlib.h"
Expand All @@ -95,21 +96,13 @@ NOTE: This file needs to have the comments cleaned up for most of the
#endif
#endif

#ifndef MFSD_INTERNAL
#define MFSD_INTERNAL
#endif

#ifdef MFSD_INTERNAL
/* Private function prototypes */
#include "mf_priv.h"
#endif

intn SDsetup_szip_parms(int32 id, NC *handle, comp_info *c_info, int32 *cdims);

/* Whether we've installed the library termination function yet for this interface */
static intn library_terminate = FALSE;

#ifdef MFSD_INTERNAL
/******************************************************************************
NAME
SDIhandle_from_id -- get the handle from this object
Expand Down Expand Up @@ -214,7 +207,6 @@ SDIget_dim(NC *handle, /* IN: the handle for this file */
done:
return ret_value;
} /* SDIget_dim */
#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
Expand Down Expand Up @@ -243,8 +235,6 @@ SDIstart(void)
return (ret_value);
} /* end SDIstart() */

#ifdef MFSD_INTERNAL

/******************************************************************************
NAME
SDI_can_clobber -- check permission on the file
Expand Down Expand Up @@ -284,8 +274,6 @@ SDI_can_clobber(const char *name)
/* no permission to write, don't do the create */
return (0);
}
#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
SDstart -- open a file
Expand Down Expand Up @@ -1400,8 +1388,6 @@ SDendaccess(int32 id /* IN: dataset ID */)
return ret_value;
} /* SDendaccess */

#ifdef MFSD_INTERNAL

/******************************************************************************
NAME
SDIputattr -- put an attribute in an attribute list
Expand Down Expand Up @@ -1476,8 +1462,6 @@ SDIputattr(NC_array **ap, /* IN/OUT: attribute list */
return ret_value;
} /* SDIputattr */

#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
SDsetrange -- simulate a call to DFSDsetrange
Expand Down Expand Up @@ -1544,7 +1528,6 @@ SDsetrange(int32 sdsid, /* IN: dataset ID */
return ret_value;
} /* SDsetrange */

#ifdef MFSD_INTERNAL
/******************************************************************************
NAME
SDIapfromid -- get the attribute list
Expand Down Expand Up @@ -1621,8 +1604,6 @@ SDIapfromid(int32 id, /* IN: object ID */
return ret_value;
} /* SDIapfromid */

#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
SDsetattr -- user level function to create and set an attribute
Expand Down Expand Up @@ -2417,7 +2398,6 @@ SDgetcal(int32 sdsid, /* IN: dataset ID */
return ret_value;
} /* SDgetcal */

#ifdef MFSD_INTERNAL
/******************************************************************************
NAME
SDgetcoordvar -- get index of coordinate variable
Expand Down Expand Up @@ -2538,8 +2518,6 @@ SDIgetcoordvar(NC *handle, /* IN: file handle */
return ret_value;
} /* SDIgetcoordvar */

#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
SDsetdimstrs -- set "dimension strings"
Expand Down Expand Up @@ -2618,7 +2596,6 @@ SDsetdimstrs(int32 id, /* IN: dimension ID */
return ret_value;
} /* SDsetdimstrs */

#ifdef MFSD_INTERNAL
/******************************************************************************
NAME
SDIfreevarAID -- free a variables AID
Expand Down Expand Up @@ -2662,7 +2639,6 @@ SDIfreevarAID(NC *handle, /* IN: file handle */
done:
return ret_value;
} /* SDIfreevarAID */
#endif /* MFSD_INTERNAL */

/******************************************************************************
NAME
Expand Down
Loading