From fdb1d0a4df496e7a3232a950d5c72231363cf67a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 8 Oct 2014 08:33:00 -0600 Subject: Remove non-portable references to syslog from apps/examples --- apps/examples/nxffs/nxffs_main.c | 230 +++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 119 deletions(-) (limited to 'apps/examples/nxffs/nxffs_main.c') diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c index 13875d8e6..1aa563e17 100644 --- a/apps/examples/nxffs/nxffs_main.c +++ b/apps/examples/nxffs/nxffs_main.c @@ -114,14 +114,6 @@ # define CONFIG_EXAMPLES_NXFFS_VERBOSE 0 #endif -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS) -# define message syslog -# define msgflush() -#else -# define message printf -# define msgflush() fflush(stdout); -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -172,13 +164,13 @@ extern FAR struct mtd_dev_s *nxffs_archinitialize(void); static void nxffs_showmemusage(struct mallinfo *mmbefore, struct mallinfo *mmafter) { - message("VARIABLE BEFORE AFTER\n"); - message("======== ======== ========\n"); - message("arena %8x %8x\n", mmbefore->arena, mmafter->arena); - message("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); - message("mxordblk %8x %8x\n", mmbefore->mxordblk, mmafter->mxordblk); - message("uordblks %8x %8x\n", mmbefore->uordblks, mmafter->uordblks); - message("fordblks %8x %8x\n", mmbefore->fordblks, mmafter->fordblks); + printf("VARIABLE BEFORE AFTER\n"); + printf("======== ======== ========\n"); + printf("arena %8x %8x\n", mmbefore->arena, mmafter->arena); + printf("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); + printf("mxordblk %8x %8x\n", mmbefore->mxordblk, mmafter->mxordblk); + printf("uordblks %8x %8x\n", mmbefore->uordblks, mmafter->uordblks); + printf("fordblks %8x %8x\n", mmbefore->fordblks, mmafter->fordblks); } /**************************************************************************** @@ -197,7 +189,7 @@ static void nxffs_loopmemusage(void) /* Show the change from the previous loop */ - message("\nEnd of loop memory usage:\n"); + printf("\nEnd of loop memory usage:\n"); nxffs_showmemusage(&g_mmprevious, &g_mmafter); /* Set up for the next test */ @@ -220,7 +212,7 @@ static void nxffs_endmemusage(void) #else (void)mallinfo(&g_mmafter); #endif - message("\nFinal memory usage:\n"); + printf("\nFinal memory usage:\n"); nxffs_showmemusage(&g_mmbefore, &g_mmafter); } @@ -269,8 +261,8 @@ static inline void nxffs_randname(FAR struct nxffs_filedesc_s *file) file->name = (FAR char*)malloc(alloclen + 1); if (!file->name) { - message("ERROR: Failed to allocate name, length=%d\n", namelen); - msgflush(); + printf("ERROR: Failed to allocate name, length=%d\n", namelen); + fflush(stdout); exit(5); } @@ -335,9 +327,9 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file) if (errno != ENOSPC) { - message("ERROR: Failed to open file for writing: %d\n", errno); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); + printf("ERROR: Failed to open file for writing: %d\n", errno); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); } nxffs_freefile(file); return ERROR; @@ -367,11 +359,11 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file) if (err != ENOSPC) { - message("ERROR: Failed to write file: %d\n", err); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Write offset: %ld\n", (long)offset); - message(" Write size: %ld\n", (long)nbytestowrite); + printf("ERROR: Failed to write file: %d\n", err); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Write offset: %ld\n", (long)offset); + printf(" Write size: %ld\n", (long)nbytestowrite); ret = ERROR; } @@ -382,12 +374,12 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file) ret = unlink(file->name); if (ret < 0) { - message(" Failed to remove partial file\n"); + printf(" Failed to remove partial file\n"); } else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message(" Successfully removed partial file\n"); + printf(" Successfully removed partial file\n"); #endif } @@ -396,12 +388,12 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file) } else if (nbyteswritten != nbytestowrite) { - message("ERROR: Partial write:\n"); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Write offset: %ld\n", (long)offset); - message(" Write size: %ld\n", (long)nbytestowrite); - message(" Written: %ld\n", (long)nbyteswritten); + printf("ERROR: Partial write:\n"); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Write offset: %ld\n", (long)offset); + printf(" Write size: %ld\n", (long)nbytestowrite); + printf(" Written: %ld\n", (long)nbyteswritten); } offset += nbyteswritten; @@ -432,13 +424,13 @@ static int nxffs_fillfs(void) if (ret < 0) { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message("ERROR: Failed to write file %d\n", i); + printf("ERROR: Failed to write file %d\n", i); #endif return ERROR; } #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message(" Created file %s\n", file->name); + printf(" Created file %s\n", file->name); #endif g_nfiles++; } @@ -465,32 +457,32 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file, nbytesread = read(fd, &g_fileimage[offset], len); if (nbytesread < 0) { - message("ERROR: Failed to read file: %d\n", errno); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Read offset: %ld\n", (long)offset); - message(" Read size: %ld\n", (long)len); + printf("ERROR: Failed to read file: %d\n", errno); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Read offset: %ld\n", (long)offset); + printf(" Read size: %ld\n", (long)len); return ERROR; } else if (nbytesread == 0) { #if 0 /* No... we do this on purpose sometimes */ - message("ERROR: Unexpected end-of-file:\n"); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Read offset: %ld\n", (long)offset); - message(" Read size: %ld\n", (long)len); + printf("ERROR: Unexpected end-of-file:\n"); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Read offset: %ld\n", (long)offset); + printf(" Read size: %ld\n", (long)len); #endif return ERROR; } else if (nbytesread != len) { - message("ERROR: Partial read:\n"); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Read offset: %ld\n", (long)offset); - message(" Read size: %ld\n", (long)len); - message(" Bytes read: %ld\n", (long)nbytesread); + printf("ERROR: Partial read:\n"); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Read offset: %ld\n", (long)offset); + printf(" Read size: %ld\n", (long)len); + printf(" Bytes read: %ld\n", (long)nbytesread); } return nbytesread; } @@ -513,9 +505,9 @@ static inline int nxffs_rdfile(FAR struct nxffs_filedesc_s *file) { if (!file->deleted) { - message("ERROR: Failed to open file for reading: %d\n", errno); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); + printf("ERROR: Failed to open file for reading: %d\n", errno); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); } return ERROR; } @@ -539,9 +531,9 @@ static inline int nxffs_rdfile(FAR struct nxffs_filedesc_s *file) crc = crc32(g_fileimage, file->len); if (crc != file->crc) { - message("ERROR: Bad CRC: %d vs %d\n", crc, file->crc); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); + printf("ERROR: Bad CRC: %d vs %d\n", crc, file->crc); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); close(fd); return ERROR; } @@ -551,10 +543,10 @@ static inline int nxffs_rdfile(FAR struct nxffs_filedesc_s *file) nbytesread = nxffs_rdblock(fd, file, ntotalread, 1024) ; if (nbytesread > 0) { - message("ERROR: Read past the end of file\n"); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" Bytes read: %d\n", nbytesread); + printf("ERROR: Read past the end of file\n"); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" Bytes read: %d\n", nbytesread); close(fd); return ERROR; } @@ -586,7 +578,7 @@ static int nxffs_verifyfs(void) if (file->deleted) { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message("Deleted file %d OK\n", i); + printf("Deleted file %d OK\n", i); #endif nxffs_freefile(file); g_ndeleted--; @@ -594,9 +586,9 @@ static int nxffs_verifyfs(void) } else { - message("ERROR: Failed to read a file: %d\n", i); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); + printf("ERROR: Failed to read a file: %d\n", i); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); return ERROR; } } @@ -605,9 +597,9 @@ static int nxffs_verifyfs(void) if (file->deleted) { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message("Succesffully read a deleted file\n"); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); + printf("Succesffully read a deleted file\n"); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); #endif nxffs_freefile(file); g_ndeleted--; @@ -617,7 +609,7 @@ static int nxffs_verifyfs(void) else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message(" Verifed file %s\n", file->name); + printf(" Verifed file %s\n", file->name); #endif } } @@ -669,15 +661,15 @@ static int nxffs_delfiles(void) ret = unlink(file->name); if (ret < 0) { - message("ERROR: Unlink %d failed: %d\n", i+1, errno); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" File index: %d\n", j); + printf("ERROR: Unlink %d failed: %d\n", i+1, errno); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" File index: %d\n", j); } else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message(" Deleted file %s\n", file->name); + printf(" Deleted file %s\n", file->name); #endif file->deleted = true; g_ndeleted++; @@ -716,15 +708,15 @@ static int nxffs_delallfiles(void) ret = unlink(file->name); if (ret < 0) { - message("ERROR: Unlink %d failed: %d\n", i+1, errno); - message(" File name: %s\n", file->name); - message(" File size: %d\n", file->len); - message(" File index: %d\n", i); + printf("ERROR: Unlink %d failed: %d\n", i+1, errno); + printf(" File name: %s\n", file->name); + printf(" File size: %d\n", file->len); + printf(" File index: %d\n", i); } else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message(" Deleted file %s\n", file->name); + printf(" Deleted file %s\n", file->name); #endif nxffs_freefile(file); } @@ -754,24 +746,24 @@ static int nxffs_directory(void) { /* Failed to open the directory */ - message("ERROR: Failed to open directory '%s': %d\n", - CONFIG_EXAMPLES_NXFFS_MOUNTPT, errno); + printf("ERROR: Failed to open directory '%s': %d\n", + CONFIG_EXAMPLES_NXFFS_MOUNTPT, errno); return ERROR; } /* Read each directory entry */ - message("Directory:\n"); + printf("Directory:\n"); number = 1; do { entryp = readdir(dirp); if (entryp) { - message("%2d. Type[%d]: %s Name: %s\n", - number, entryp->d_type, - entryp->d_type == DTYPE_FILE ? "File " : "Error", - entryp->d_name); + printf("%2d. Type[%d]: %s Name: %s\n", + number, entryp->d_type, + entryp->d_type == DTYPE_FILE ? "File " : "Error", + entryp->d_name); } number++; } @@ -812,8 +804,8 @@ int nxffs_main(int argc, char *argv[]) #endif if (!mtd) { - message("ERROR: Failed to create RAM MTD instance\n"); - msgflush(); + printf("ERROR: Failed to create RAM MTD instance\n"); + fflush(stdout); exit(1); } @@ -822,8 +814,8 @@ int nxffs_main(int argc, char *argv[]) ret = nxffs_initialize(mtd); if (ret < 0) { - message("ERROR: NXFFS initialization failed: %d\n", -ret); - msgflush(); + printf("ERROR: NXFFS initialization failed: %d\n", -ret); + fflush(stdout); exit(2); } @@ -832,8 +824,8 @@ int nxffs_main(int argc, char *argv[]) ret = mount(NULL, CONFIG_EXAMPLES_NXFFS_MOUNTPT, "nxffs", 0, NULL); if (ret < 0) { - message("ERROR: Failed to mount the NXFFS volume: %d\n", errno); - msgflush(); + printf("ERROR: Failed to mount the NXFFS volume: %d\n", errno); + fflush(stdout); exit(3); } @@ -863,11 +855,11 @@ int nxffs_main(int argc, char *argv[]) * (hopefully that the file system is full) */ - message("\n=== FILLING %u =============================\n", i); + printf("\n=== FILLING %u =============================\n", i); (void)nxffs_fillfs(); - message("Filled file system\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("Filled file system\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); nxffs_dump(mtd, CONFIG_EXAMPLES_NXFFS_VERBOSE); /* Directory listing */ @@ -879,34 +871,34 @@ int nxffs_main(int argc, char *argv[]) ret = nxffs_verifyfs(); if (ret < 0) { - message("ERROR: Failed to verify files\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("ERROR: Failed to verify files\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); } else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message("Verified!\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("Verified!\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); #endif } /* Delete some files */ - message("\n=== DELETING %u ============================\n", i); + printf("\n=== DELETING %u ============================\n", i); ret = nxffs_delfiles(); if (ret < 0) { - message("ERROR: Failed to delete files\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("ERROR: Failed to delete files\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); } else { - message("Deleted some files\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("Deleted some files\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); } nxffs_dump(mtd, CONFIG_EXAMPLES_NXFFS_VERBOSE); @@ -919,30 +911,30 @@ int nxffs_main(int argc, char *argv[]) ret = nxffs_verifyfs(); if (ret < 0) { - message("ERROR: Failed to verify files\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("ERROR: Failed to verify files\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); } else { #if CONFIG_EXAMPLES_NXFFS_VERBOSE != 0 - message("Verified!\n"); - message(" Number of files: %d\n", g_nfiles); - message(" Number deleted: %d\n", g_ndeleted); + printf("Verified!\n"); + printf(" Number of files: %d\n", g_nfiles); + printf(" Number deleted: %d\n", g_ndeleted); #endif } /* Show memory usage */ nxffs_loopmemusage(); - msgflush(); + fflush(stdout); } /* Delete all files then show memory usage again */ nxffs_delallfiles(); nxffs_endmemusage(); - msgflush(); + fflush(stdout); return 0; } -- cgit v1.2.3