WebSVN – public – Diff – /sportwatcher/trunk/libgarmin/pack.c

     rpath[j++] = path[n++];
     if ( path[n] == '/' ) {
       rpath[j] = 0;
       if ( stat(rpath,&sb) != -1 ) {  /* this part already exists */
 	if ( !S_ISDIR(sb.st_mode) ) { /* but is not a directory!  */
+	  char hv0[1024];
-	  fprintf(stderr,"mkpath: %s exists but is not a directory",rpath);
+	  sprintf(&hv0[0], "mkpath: %s exists but is not a directory",rpath);
+	  garmin_queue_error(hv0, err_error);
 	  ok = 0;
 	  break;
 	} else {
 	  /* figure out who owns the directory, what permissions they have */
 	if ( mkdir(rpath,mode) != -1 ) {   /* have to make this part */
 	  if ( already ) {
 	    chown(rpath,owner,group);
+	  }
 	} else {
+	  char hv0[1024];
-	  fprintf(stderr,"mkpath: mkdir(%s,%o): %s",path,mode,strerror(errno));
+	  sprintf(hv0, "mkpath: mkdir(%s,%o): %s",path,mode,strerror(errno));
+	  garmin_queue_error(hv0, err_error);
 	  ok = 0;
 	  break;
+	}
+      }
+    }
   if ( mkdir(path,mode) != -1 ) {
     if ( already ) {
       chown(rpath,owner,group);
+    }
   } else {
+    char hv0[1024];
-    fprintf(stderr,"mkpath: mkdir(%s,%o): %s",path,mode,strerror(errno));
+    sprintf(hv0, "mkpath: mkdir(%s,%o): %s",path,mode,strerror(errno));
+    garmin_queue_error(hv0, err_error);
     ok = 0;
+  }
   return ok;
+}
 	/* write GARMIN_MAGIC, GARMIN_VERSION, and bytes. */
 	pos = buf;
 	memset(pos,0,GARMIN_HEADER);
-	strncpy(pos,GARMIN_MAGIC,11);
+	strncpy((char *)pos,GARMIN_MAGIC,11);
 	put_uint32(pos+12,GARMIN_VERSION);
 	marker = pos+16;
 	pos += GARMIN_HEADER;
 	packed = GARMIN_HEADER;
 	/* Now write the data to the file and close the file. */
 	if ( (wrote = write(fd,buf,packed)) != packed ) {
 	  /* write error! */
+	  char hv0[256];
-	  printf("write of %d bytes returned %d: %s\n",
+	  sprintf(hv0, "write of %d bytes returned %d: %s",
 		 packed,wrote,strerror(errno));
+	  garmin_queue_error(hv0, err_error);
+	}
 	close(fd);
 	/* Free the buffer. */
 	free(buf);
       } else {
 	/* malloc error */
+	char hv0[256];
-	printf("malloc(%d): %s\n",bytes + GARMIN_HEADER, strerror(errno));
+	sprintf(hv0, "malloc(%d): %s",bytes + GARMIN_HEADER, strerror(errno));
+	garmin_queue_error(hv0, err_error);
+      }
     } else {
       /* problem creating file. */
+      char hv0[1024];
-      printf("creat: %s: %s\n",path,strerror(errno));
+      sprintf(hv0, "creat: %s: %s",path,strerror(errno));
+      garmin_queue_error(hv0, err_error);
+    }
   } else {
     /* don't write empty data */
+    char hv0[1024];
-    printf("%s: garmin_data_size was 0\n",path);
+    printf("%s: garmin_data_size was 0",path);
+    garmin_queue_error(hv0, err_error);
+  }
   return bytes;
+}
+{
   uint8 * start;
   uint8 * finish;
   uint8 * marker;
   uint32  bytes = 0;
+  char    hv0[256];
   if ( garmin_data_size(data) == 0 ) return 0;
   /* OK, we must know how to serialize this data.  Let's go for it. */
   CASE_DATA(1011);
   CASE_DATA(1012);
   CASE_DATA(1013);
   CASE_DATA(1015);
   default:
-    printf("garmin_pack: data type %d not supported\n",data->type);
+    sprintf(hv0, "garmin_pack: data type %d not supported",data->type);
+    garmin_queue_error(hv0, err_warning);
     break;
+  }
 #undef CASE_DATA
   return bytes;

Subversion Repositories public

(root)/sportwatcher/trunk/libgarmin/pack.c – Rev 93 → 136