]> www.infradead.org Git - mtd-utils.git/commitdiff
nandwrite: remove C99 comment style
authorBrian Norris <computersforpeace@gmail.com>
Fri, 19 Aug 2011 17:07:50 +0000 (10:07 -0700)
committerArtem Bityutskiy <artem.bityutskiy@intel.com>
Tue, 23 Aug 2011 06:27:49 +0000 (09:27 +0300)
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
nandwrite.c

index d41ae86122c53793226721a1c71dfca954573c11..7c3a85ee506a06e71df7688cf742b23c3969cd07 100644 (file)
@@ -274,13 +274,13 @@ int main(int argc, char * const argv[])
        int oobinfochanged = 0;
        struct nand_oobinfo old_oobinfo;
        bool failed = true;
-       // contains all the data read from the file so far for the current eraseblock
+       /* contains all the data read from the file so far for the current eraseblock */
        unsigned char *filebuf = NULL;
        size_t filebuf_max = 0;
        size_t filebuf_len = 0;
-       // points to the current page inside filebuf
+       /* points to the current page inside filebuf */
        unsigned char *writebuf = NULL;
-       // points to the OOB for the current page in filebuf
+       /* points to the OOB for the current page in filebuf */
        unsigned char *oobreadbuf = NULL;
        unsigned char *oobbuf = NULL;
        libmtd_t mtd_desc;
@@ -429,14 +429,14 @@ int main(int argc, char * const argv[])
            lseek(ifd, 0, SEEK_SET);
        }
 
-       // Check, if file is page-aligned
+       /* Check, if file is page-aligned */
        if ((!pad) && ((imglen % pagelen) != 0)) {
                fprintf(stderr, "Input file is not page-aligned. Use the padding "
                                 "option.\n");
                goto closeall;
        }
 
-       // Check, if length fits into device
+       /* Check, if length fits into device */
        if (((imglen / pagelen) * mtd.min_io_size) > (mtd.size - mtdoffset)) {
                fprintf(stderr, "Image %d bytes, NAND page %d bytes, OOB area %d"
                                " bytes, device size %lld bytes\n",
@@ -479,8 +479,10 @@ int main(int argc, char * const argv[])
                        blockstart = mtdoffset & (~ebsize_aligned + 1);
                        offs = blockstart;
 
-                       // if writebuf == filebuf, we are rewinding so we must not
-                       // reset the buffer but just replay it
+                       /*
+                        * if writebuf == filebuf, we are rewinding so we must
+                        * not reset the buffer but just replay it
+                        */
                        if (writebuf != filebuf) {
                                erase_buffer(filebuf, filebuf_len);
                                filebuf_len = 0;
@@ -515,7 +517,7 @@ int main(int argc, char * const argv[])
 
                }
 
-               // Read more data from the input if there isn't enough in the buffer
+               /* Read more data from the input if there isn't enough in the buffer */
                if ((writebuf + mtd.min_io_size) > (filebuf + filebuf_len)) {
                        int readlen = mtd.min_io_size;
 
@@ -524,7 +526,7 @@ int main(int argc, char * const argv[])
 
                        while (tinycnt < readlen) {
                                cnt = read(ifd, writebuf + tinycnt, readlen - tinycnt);
-                               if (cnt == 0) { // EOF
+                               if (cnt == 0) { /* EOF */
                                        break;
                                } else if (cnt < 0) {
                                        perror("File I/O error on input");
@@ -570,7 +572,7 @@ int main(int argc, char * const argv[])
                if (writeoob) {
                        oobreadbuf = writebuf + mtd.min_io_size;
 
-                       // Read more data for the OOB from the input if there isn't enough in the buffer
+                       /* Read more data for the OOB from the input if there isn't enough in the buffer */
                        if ((oobreadbuf + mtd.oob_size) > (filebuf + filebuf_len)) {
                                int readlen = mtd.oob_size;
                                int alreadyread = (filebuf + filebuf_len) - oobreadbuf;
@@ -578,7 +580,7 @@ int main(int argc, char * const argv[])
 
                                while (tinycnt < readlen) {
                                        cnt = read(ifd, oobreadbuf + tinycnt, readlen - tinycnt);
-                                       if (cnt == 0) { // EOF
+                                       if (cnt == 0) { /* EOF */
                                                break;
                                        } else if (cnt < 0) {
                                                perror("File I/O error on input");