Get rid of c++ style comments in C code.
This commit is contained in:
parent
8e6872857e
commit
2e188ef1ff
|
@ -72,6 +72,5 @@ archive_entry_copy_bhfi(struct archive_entry *entry,
|
|||
archive_entry_set_nlink(entry, bhfi->nNumberOfLinks);
|
||||
archive_entry_set_size(entry, (((int64_t)bhfi->nFileSizeHigh) << 32)
|
||||
+ bhfi->nFileSizeLow);
|
||||
// archive_entry_set_mode(entry, st->st_mode);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1403,7 +1403,7 @@ add_entry(struct iso9660 *iso9660, struct file_info *file)
|
|||
iso9660->pending_files[hole] = file;
|
||||
return;
|
||||
}
|
||||
// Move parent into hole <==> move hole up tree.
|
||||
/* Move parent into hole <==> move hole up tree. */
|
||||
iso9660->pending_files[hole] = iso9660->pending_files[parent];
|
||||
hole = parent;
|
||||
}
|
||||
|
@ -1933,16 +1933,16 @@ next_entry(struct iso9660 *iso9660)
|
|||
/*
|
||||
* Rebalance the heap.
|
||||
*/
|
||||
a = 0; // Starting element and its offset
|
||||
a = 0; /* Starting element and its offset */
|
||||
a_offset = iso9660->pending_files[a]->offset
|
||||
+ iso9660->pending_files[a]->size;
|
||||
for (;;) {
|
||||
b = a + a + 1; // First child
|
||||
b = a + a + 1; /* First child */
|
||||
if (b >= iso9660->pending_files_used)
|
||||
return (r);
|
||||
b_offset = iso9660->pending_files[b]->offset
|
||||
+ iso9660->pending_files[b]->size;
|
||||
c = b + 1; // Use second child if it is smaller.
|
||||
c = b + 1; /* Use second child if it is smaller. */
|
||||
if (c < iso9660->pending_files_used) {
|
||||
c_offset = iso9660->pending_files[c]->offset
|
||||
+ iso9660->pending_files[c]->size;
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
#include <errno.h>
|
||||
#define set_errno(val) ((errno)=val)
|
||||
#include <io.h>
|
||||
#include <stdlib.h> //brings in NULL
|
||||
#include <stdlib.h> /* brings in NULL */
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
|
@ -61,7 +61,6 @@
|
|||
#include <direct.h>
|
||||
#define NOCRYPT
|
||||
#include <windows.h>
|
||||
//#define EFTYPE 7
|
||||
|
||||
#if !defined(STDIN_FILENO)
|
||||
#define STDIN_FILENO 0
|
||||
|
@ -170,8 +169,7 @@
|
|||
#ifndef S_IFIFO
|
||||
#define S_IFIFO _S_IFIFO
|
||||
#endif
|
||||
//#define S_IFCHR _S_IFCHR
|
||||
//#define S_IFDIR _S_IFDIR
|
||||
|
||||
#ifndef S_IFBLK
|
||||
#define S_IFBLK _S_IFBLK
|
||||
#endif
|
||||
|
@ -181,8 +179,6 @@
|
|||
#ifndef S_IFSOCK
|
||||
#define S_IFSOCK _S_IFSOCK
|
||||
#endif
|
||||
//#define S_IFREG _S_IFREG
|
||||
//#define S_IFMT _S_IFMT
|
||||
#ifndef S_ISBLK
|
||||
#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) /* block special */
|
||||
#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) /* fifo or socket */
|
||||
|
@ -248,9 +244,9 @@
|
|||
/* File descriptor flags used with F_GETFD and F_SETFD. */
|
||||
#define FD_CLOEXEC 1 /* Close on exec. */
|
||||
|
||||
//NOT SURE IF O_NONBLOCK is OK here but at least the 0x0004 flag is not used by anything else...
|
||||
/*NOT SURE IF O_NONBLOCK is OK here but at least the 0x0004 flag is not used by anything else... */
|
||||
#define O_NONBLOCK 0x0004 /* Non-blocking I/O. */
|
||||
//#define O_NDELAY O_NONBLOCK
|
||||
/*#define O_NDELAY O_NONBLOCK */
|
||||
|
||||
/* Symbolic constants for the access() function */
|
||||
#if !defined(F_OK)
|
||||
|
|
|
@ -7,10 +7,11 @@
|
|||
|
||||
#ifndef CONFIG_H_INCLUDED
|
||||
#define CONFIG_H_INCLUDED
|
||||
|
||||
/*
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// Check for Watcom and Microsoft Visual C compilers (WIN32 only) ///////
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
*/
|
||||
#if (defined(__WIN32__) || defined(_WIN32) || defined(__WIN32)) && !defined(__CYGWIN__)
|
||||
#define IS_WIN32 1
|
||||
|
||||
|
@ -33,8 +34,8 @@
|
|||
/* Define to 1 if UID should be unsigned */
|
||||
#define USE_UNSIGNED_GID 1
|
||||
#endif
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
/*///////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////*/
|
||||
|
||||
/* Define to 1 if you have the `acl_create_entry' function. */
|
||||
/* #undef HAVE_ACL_CREATE_ENTRY */
|
||||
|
|
Loading…
Reference in New Issue