Changeset 1790 for trunk

Timestamp:

09/12/11 15:13:41 (6 months ago)

Author:

Freddie Akeroyd

Message:

Fix some warnings. Refs #286

Location:

trunk

Files:

• applications/NXbrowse/NXbrowse.c (modified) (1 diff)
• applications/NXconvert/nxconvert_common.cpp (modified) (2 diffs)
• bindings/cpp/NeXusFile.cpp (modified) (3 diffs)
• src/napi5.c (modified) (4 diffs)

trunk/applications/NXbrowse/NXbrowse.c

@@ -769 +769 @@
    char *dataPtr;
    int i, dimSize, dataSize, lineSize;
-   int type_size = 0;
 
    if (rank > 1) { /* Recursively call DumpData until rank = 1 */

trunk/applications/NXconvert/nxconvert_common.cpp

@@ -107 +107 @@
 int convert_file(int nx_format, const char* inFile, int nx_read_access, const char* outFile, int nx_write_access, const char* definition_name_)
 {
-   int i, nx_is_definition = 0;
+   int nx_is_definition = 0;
    if (definition_name_ != NULL && definition_name_[0] == '\0') {
      definition_name = NULL;
@@ -153 +153 @@
    {
 /* now create any required links */
-       for(i=0; i<links_to_make.size(); i++)
+       for(size_t i=0; i<links_to_make.size(); i++)
        {
             if (NXopenpath(outId, links_to_make[i].to) != NX_OK) return NX_ERROR;

trunk/bindings/cpp/NeXusFile.cpp

@@ -139 +139 @@
   int rank = dims.size();
   int64_t c_dims[NX_MAXRANK];
-  for (size_t i = 0; i < rank; i++) {
+  for (int i = 0; i < rank; i++) {
     c_dims[i] = dims[i];
   }
@@ -1018 +1018 @@
     throw Exception(msg.str());
   }
-
-  int rank = start.size();
 
   NXstatus status = NXgetslab64(this->m_file_id, data, &(start[0]), &(size[0]));
@@ -1071 +1069 @@
   }
   // char attributes are always NULL terminated and so may change length
-  if (length != info.length && type != NX_CHAR) {
+  if (static_cast<unsigned>(length) != info.length && type != NX_CHAR) {
     stringstream msg;
     msg << "NXgetattr(" << info.name << ") change length [" << info.length

trunk/src/napi5.c

@@ -1179 +1179 @@
   hid_t  dataID, aid2, aid1, attID;
   herr_t status;
-  int type = NX_CHAR;
   char name[] = "target";
 
@@ -1230 +1229 @@
     pNexusFile5 pFile;
     char        linkTarget[1024];
-    int         type = NX_CHAR;
-    hid_t       targetid;
 
     pFile = NXI5assert (fid);
@@ -1267 +1264 @@
     pNexusFile5 pFile;
     char        linkTarget[1024];
-    int         type = NX_CHAR;
     char        *itemName = NULL;
-    hid_t       targetid;
 
     pFile = NXI5assert (fid);
@@ -1428 +1423 @@
 static int countObjectsInGroup(hid_t loc_id)
 {
-  int count = 0, type;
+  int count = 0;
   H5G_info_t numobj;