git.samba.org
/
gd
/
samba
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two trivial warnings
[gd/samba/.git]
/
source3
/
torture
/
nbio.c
diff --git
a/source3/torture/nbio.c
b/source3/torture/nbio.c
index 2d519b40bacefdc57c228865dcfd3e05aed997b0..2e79584d23f7bfa297dce6109d8251674157798c 100644
(file)
--- a/
source3/torture/nbio.c
+++ b/
source3/torture/nbio.c
@@
-52,7
+52,7
@@
double nbio_total(void)
return total;
}
return total;
}
-void nb_alarm(
void
)
+void nb_alarm(
int ignore
)
{
int i;
int lines=0, num_clients=0;
{
int i;
int lines=0, num_clients=0;
@@
-79,6
+79,7
@@
void nbio_shmem(int n)
}
}
}
}
+#if 0
static int ne_find_handle(int handle)
{
int i;
static int ne_find_handle(int handle)
{
int i;
@@
-88,6
+89,7
@@
static int ne_find_handle(int handle)
}
return -1;
}
}
return -1;
}
+#endif
static int find_handle(int handle)
{
static int find_handle(int handle)
{
@@
-125,7
+127,7
@@
void nb_setup(struct cli_state *cli)
}
}
-void nb_unlink(char *fname)
+void nb_unlink(c
onst c
har *fname)
{
if (!cli_unlink(c, fname)) {
#if NBDEBUG
{
if (!cli_unlink(c, fname)) {
#if NBDEBUG
@@
-136,7
+138,7
@@
void nb_unlink(char *fname)
}
}
-void nb_createx(char *fname,
+void nb_createx(c
onst c
har *fname,
unsigned create_options, unsigned create_disposition, int handle)
{
int fd, i;
unsigned create_options, unsigned create_disposition, int handle)
{
int fd, i;
@@
-148,12
+150,12
@@
void nb_createx(char *fname,
desired_access = FILE_READ_DATA | FILE_WRITE_DATA;
}
desired_access = FILE_READ_DATA | FILE_WRITE_DATA;
}
- fd = cli_nt_create_full(c, fname,
+ fd = cli_nt_create_full(c, fname,
0,
desired_access,
0x0,
FILE_SHARE_READ|FILE_SHARE_WRITE,
create_disposition,
desired_access,
0x0,
FILE_SHARE_READ|FILE_SHARE_WRITE,
create_disposition,
- create_options);
+ create_options
, 0
);
if (fd == -1 && handle != -1) {
printf("ERROR: cli_nt_create_full failed for %s - %s\n",
fname, cli_errstr(c));
if (fd == -1 && handle != -1) {
printf("ERROR: cli_nt_create_full failed for %s - %s\n",
fname, cli_errstr(c));
@@
-217,7
+219,7
@@
void nb_close(int handle)
ftable[i].handle = 0;
}
ftable[i].handle = 0;
}
-void nb_rmdir(char *fname)
+void nb_rmdir(c
onst c
har *fname)
{
if (!cli_rmdir(c, fname)) {
printf("ERROR: rmdir %s failed (%s)\n",
{
if (!cli_rmdir(c, fname)) {
printf("ERROR: rmdir %s failed (%s)\n",
@@
-226,7
+228,7
@@
void nb_rmdir(char *fname)
}
}
}
}
-void nb_rename(c
har *old,
char *new)
+void nb_rename(c
onst char *old, const
char *new)
{
if (!cli_rename(c, old, new)) {
printf("ERROR: rename %s %s failed (%s)\n",
{
if (!cli_rename(c, old, new)) {
printf("ERROR: rename %s %s failed (%s)\n",
@@
-236,7
+238,7
@@
void nb_rename(char *old, char *new)
}
}
-void nb_qpathinfo(char *fname)
+void nb_qpathinfo(c
onst c
har *fname)
{
cli_qpathinfo(c, fname, NULL, NULL, NULL, NULL, NULL);
}
{
cli_qpathinfo(c, fname, NULL, NULL, NULL, NULL, NULL);
}
@@
-260,7
+262,7
@@
static void find_fn(file_info *finfo, const char *name, void *state)
/* noop */
}
/* noop */
}
-void nb_findfirst(char *mask)
+void nb_findfirst(c
onst c
har *mask)
{
cli_list(c, mask, 0, find_fn, NULL);
}
{
cli_list(c, mask, 0, find_fn, NULL);
}
@@
-295,7
+297,7
@@
static void delete_fn(file_info *finfo, const char *name, void *state)
free(n);
}
free(n);
}
-void nb_deltree(char *dname)
+void nb_deltree(c
onst c
har *dname)
{
char *mask;
asprintf(&mask, "%s\\*", dname);
{
char *mask;
asprintf(&mask, "%s\\*", dname);