diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-11-20 11:56:16 +0100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-03 21:46:31 +1100 |
| commit | 1a855eb741c356262382f04357abdabe0bd2ad1b (patch) | |
| tree | a96cea1b8a8a8c84e25c7c80a37d202ecb6deac1 | |
| parent | cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9 (diff) | |
| download | samba-1a855eb741c356262382f04357abdabe0bd2ad1b.tar.gz samba-1a855eb741c356262382f04357abdabe0bd2ad1b.tar.bz2 samba-1a855eb741c356262382f04357abdabe0bd2ad1b.zip | |
s4:ntvfs/posix/pvfs_resolve - Fix "discard const" warning
I removed two "const"s in front of string declarations to achieve this.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
| -rw-r--r-- | source4/ntvfs/posix/pvfs_resolve.c | 6 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index c01799e68c..8f462648bd 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -696,7 +696,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs, if (h->have_opendb_entry) { struct odb_lock *lck; - const char *name = NULL; + char *name = NULL; lck = odb_lock(h, h->pvfs->odb_context, &h->odb_locking_key); if (lck == NULL) { @@ -707,7 +707,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs, return NT_STATUS_INTERNAL_DB_CORRUPTION; } - status = odb_get_path(lck, &name); + status = odb_get_path(lck, (const char **) &name); if (NT_STATUS_IS_OK(status)) { /* * This relies an the fact that @@ -719,7 +719,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs, if (strcmp(h->name->full_name, name) != 0) { const char *orig_dir; const char *new_file; - const char *new_orig; + char *new_orig; char *delim; delim = strrchr(name, '/'); diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index b032ab3f93..508dbb02dc 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -124,7 +124,7 @@ struct pvfs_dos_fileinfo { a filename passed by the client to any function */ struct pvfs_filename { - const char *original_name; + char *original_name; char *full_name; const char *stream_name; /* does not include :$DATA suffix */ uint32_t stream_id; /* this uses a hash, so is probabilistic */ |