* cpio.c: Replaced NULL with (char *) NULL. Likewise for 0, where
NULL was meant. * direntry.c: Likewise. * extfs.c: Likewise. * fish.c: Likewise. * ftpfs.c: Likewise. * mcfs.c: Likewise. * tar.c: Likewise. * undelfs.c: Likewise. * vfs.c: Likewise.
Этот коммит содержится в:
Roland Illig
родитель
11842a375f
Коммит
4bc786735e
@ -1,3 +1,16 @@
|
||||
2004-09-24 Roland Illig <roland.illig@gmx.de>
|
||||
|
||||
* cpio.c: Replaced NULL with (char *) NULL. Likewise for 0, where
|
||||
NULL was meant.
|
||||
* direntry.c: Likewise.
|
||||
* extfs.c: Likewise.
|
||||
* fish.c: Likewise.
|
||||
* ftpfs.c: Likewise.
|
||||
* mcfs.c: Likewise.
|
||||
* tar.c: Likewise.
|
||||
* undelfs.c: Likewise.
|
||||
* vfs.c: Likewise.
|
||||
|
||||
2004-09-23 Roland Illig <roland.illig@gmx.de>
|
||||
|
||||
* cpio.c (cpio_read_bin_head): Replaced GUINT16_SWAP_LE_BE with
|
||||
|
||||
@ -160,7 +160,7 @@ cpio_open_cpio_file (struct vfs_class *me, struct vfs_s_super *super,
|
||||
char *s;
|
||||
|
||||
mc_close (fd);
|
||||
s = g_strconcat (name, decompress_extension (type), NULL);
|
||||
s = g_strconcat (name, decompress_extension (type), (char *) NULL);
|
||||
if ((fd = mc_open (s, O_RDONLY)) == -1) {
|
||||
message (1, MSG_ERROR, _("Cannot open cpio archive\n%s"), s);
|
||||
g_free (s);
|
||||
|
||||
@ -540,7 +540,7 @@ vfs_s_fullpath (struct vfs_class *me, struct vfs_s_inode *ino)
|
||||
ino = ino->ent->dir;
|
||||
if (ino == ino->super->root)
|
||||
break;
|
||||
newpath = g_strconcat (ino->ent->name, "/", path, NULL);
|
||||
newpath = g_strconcat (ino->ent->name, "/", path, (char *) NULL);
|
||||
g_free (path);
|
||||
path = newpath;
|
||||
}
|
||||
@ -552,7 +552,7 @@ vfs_s_fullpath (struct vfs_class *me, struct vfs_s_inode *ino)
|
||||
return g_strdup (ino->ent->name);
|
||||
|
||||
return g_strconcat (ino->ent->dir->ent->name, PATH_SEP_STR,
|
||||
ino->ent->name, NULL);
|
||||
ino->ent->name, (char *) NULL);
|
||||
}
|
||||
|
||||
/* Support of archives */
|
||||
|
||||
@ -113,7 +113,7 @@ extfs_fill_names (struct vfs_class *me, fill_names_f func)
|
||||
while (a) {
|
||||
name =
|
||||
g_strconcat (a->name ? a->name : "", "#",
|
||||
extfs_prefixes[a->fstype], NULL);
|
||||
extfs_prefixes[a->fstype], (char *) NULL);
|
||||
(*func) (name);
|
||||
g_free (name);
|
||||
a = a->next;
|
||||
@ -240,7 +240,7 @@ extfs_open_archive (int fstype, const char *name, struct archive **pparc)
|
||||
mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
|
||||
cmd =
|
||||
g_strconcat (mc_extfsdir, extfs_prefixes[fstype], " list ",
|
||||
local_name ? local_name : tmp, NULL);
|
||||
local_name ? local_name : tmp, (char *) NULL);
|
||||
if (tmp)
|
||||
g_free (tmp);
|
||||
g_free (mc_extfsdir);
|
||||
@ -621,7 +621,7 @@ extfs_cmd (const char *extfs_cmd, struct archive *archive,
|
||||
mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
|
||||
cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype],
|
||||
extfs_cmd, archive_name, " ", quoted_file, " ",
|
||||
quoted_localname, NULL);
|
||||
quoted_localname, (char *) NULL);
|
||||
g_free (quoted_file);
|
||||
g_free (quoted_localname);
|
||||
g_free (mc_extfsdir);
|
||||
@ -649,7 +649,7 @@ extfs_run (const char *file)
|
||||
archive_name = name_quote (extfs_get_archive_name (archive), 0);
|
||||
mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
|
||||
cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype],
|
||||
" run ", archive_name, " ", q, NULL);
|
||||
" run ", archive_name, " ", q, (char *) NULL);
|
||||
g_free (mc_extfsdir);
|
||||
g_free (archive_name);
|
||||
g_free (q);
|
||||
|
||||
@ -201,7 +201,7 @@ fish_pipeopen(struct vfs_s_super *super, const char *path, const char *argv[])
|
||||
static char *fish_getcwd(struct vfs_class *me, struct vfs_s_super *super)
|
||||
{
|
||||
if (fish_command (me, super, WANT_STRING, "#PWD\npwd; echo '### 200'\n") == COMPLETE)
|
||||
return g_strconcat (reply_str, "/", NULL);
|
||||
return g_strconcat (reply_str, "/", (char *) NULL);
|
||||
ERRNOR (EIO, NULL);
|
||||
}
|
||||
|
||||
@ -247,7 +247,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
|
||||
if (!SUP.password) {
|
||||
char *p, *op;
|
||||
p = g_strconcat (_(" fish: Password required for "),
|
||||
SUP.user, " ", NULL);
|
||||
SUP.user, " ", (char *) NULL);
|
||||
op = vfs_get_password (p);
|
||||
g_free (p);
|
||||
if (op == NULL)
|
||||
@ -291,7 +291,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
|
||||
print_vfs_message (_("fish: Connected, home %s."), SUP.cwdir);
|
||||
#if 0
|
||||
super->name =
|
||||
g_strconcat ("/#sh:", SUP.user, "@", SUP.host, "/", NULL);
|
||||
g_strconcat ("/#sh:", SUP.user, "@", SUP.host, "/", (char *) NULL);
|
||||
#endif
|
||||
super->name = g_strdup (PATH_SEP_STR);
|
||||
|
||||
@ -876,7 +876,7 @@ fish_fill_names (struct vfs_class *me, fill_names_f func)
|
||||
}
|
||||
|
||||
name = g_strconcat ("/#sh:", SUP.user, "@", SUP.host, flags,
|
||||
"/", SUP.cwdir, NULL);
|
||||
"/", SUP.cwdir, (char *) NULL);
|
||||
(*func)(name);
|
||||
g_free (name);
|
||||
super = super->next;
|
||||
|
||||
@ -439,7 +439,7 @@ ftpfs_login_server (struct vfs_class *me, struct vfs_s_super *super,
|
||||
if (!anon || MEDATA->logfile)
|
||||
pass = op;
|
||||
else {
|
||||
pass = g_strconcat ("-", op, NULL);
|
||||
pass = g_strconcat ("-", op, (char *) NULL);
|
||||
wipe_password (op);
|
||||
}
|
||||
|
||||
@ -1661,7 +1661,7 @@ ftpfs_fill_names (struct vfs_class *me, fill_names_f func)
|
||||
char *name;
|
||||
|
||||
while (super){
|
||||
name = g_strconcat ("/#ftp:", SUP.user, "@", SUP.host, "/", SUP.cwdir, NULL);
|
||||
name = g_strconcat ("/#ftp:", SUP.user, "@", SUP.host, "/", SUP.cwdir, (char *) NULL);
|
||||
(*func)(name);
|
||||
g_free (name);
|
||||
super = super->next;
|
||||
|
||||
@ -100,7 +100,7 @@ mcfs_fill_names (struct vfs_class *me, fill_names_f func)
|
||||
if (mcfs_connections[i].host == 0)
|
||||
continue;
|
||||
name = g_strconcat ("/#mc:", mcfs_connections[i].user,
|
||||
"@", mcfs_connections[i].host, NULL);
|
||||
"@", mcfs_connections[i].host, (char *) NULL);
|
||||
(*func) (name);
|
||||
g_free (name);
|
||||
}
|
||||
|
||||
@ -221,7 +221,7 @@ tar_open_archive_int (struct vfs_class *me, const char *name,
|
||||
if (type != COMPRESSION_NONE) {
|
||||
char *s;
|
||||
mc_close (result);
|
||||
s = g_strconcat (archive->name, decompress_extension (type), NULL);
|
||||
s = g_strconcat (archive->name, decompress_extension (type), (char *) NULL);
|
||||
result = mc_open (s, O_RDONLY);
|
||||
if (result == -1)
|
||||
message (1, MSG_ERROR, _("Cannot open tar archive\n%s"), s);
|
||||
|
||||
@ -141,14 +141,14 @@ undelfs_get_path (const char *dirname, char **fsname, char **file)
|
||||
|
||||
*file = g_strdup (p+1);
|
||||
tmp = g_strndup (dirname, p - dirname);
|
||||
*fsname = g_strconcat ("/dev/", tmp, NULL);
|
||||
*fsname = g_strconcat ("/dev/", tmp, (char *) NULL);
|
||||
g_free (tmp);
|
||||
return;
|
||||
}
|
||||
p--;
|
||||
}
|
||||
*file = g_strdup ("");
|
||||
*fsname = g_strconcat ("/dev/", dirname, NULL);
|
||||
*fsname = g_strconcat ("/dev/", dirname, (char *) NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -978,7 +978,7 @@ char *
|
||||
vfs_translate_url (const char *url)
|
||||
{
|
||||
if (strncmp (url, "ftp://", 6) == 0)
|
||||
return g_strconcat ("/#ftp:", url + 6, NULL);
|
||||
return g_strconcat ("/#ftp:", url + 6, (char *) NULL);
|
||||
else if (strncmp (url, "a:", 2) == 0)
|
||||
return g_strdup ("/#a");
|
||||
else
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user