From: Enrico Scholz Date: Tue, 21 Oct 2003 13:23:50 +0000 (+0000) Subject: use 'Vserver' class instead of 'string' X-Git-Tag: VERSION_0_10~1159 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a980d5c20368d46d2a19aee9e3ff9bc6402e2d14;p=util-vserver.git use 'Vserver' class instead of 'string' fixed format-string error git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@254 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/src/vutil.cc b/util-vserver/src/vutil.cc index 84f78de..5ca9a40 100644 --- a/util-vserver/src/vutil.cc +++ b/util-vserver/src/vutil.cc @@ -98,7 +98,7 @@ int setext2flag (const char *fname, bool set, int ext2flags) ret = ioctl (fd,EXT2_IOC_SETFLAGS,&flags); close (fd); if (ret == -1){ - fprintf (stderr,"Can't %s immutable flag on file %s (^s)\n" + fprintf (stderr,"Can't %s immutable flag on file %s (%s)\n" ,(set ? "set" : "unset") ,fname ,strerror(errno)); @@ -212,7 +212,7 @@ int vbuild_file_copy( /* Load the list of all packages in a vserver */ -void vutil_loadallpkg (string &refserver, list &packages) +void vutil_loadallpkg (Vserver const &refserver, list &packages) { FILE *fin = vutil_execdistcmd (K_PKGVERSION,refserver,NULL); if (fin != NULL){ @@ -241,10 +241,10 @@ const char K_PKGVERSION[]="pkgversion"; const char K_DUMPFILES[]="dumpfiles"; const char K_UNIFILES[]="unifiles"; -FILE *vutil_execdistcmd (const char *key, const string &vserver, const char *args) +FILE *vutil_execdistcmd (const char *key, Vserver const &vserver, const char *args) { string cmd = PKGLIBDIR "/distrib-info "; - cmd += vserver; + cmd += vserver.getConfDir(); cmd += " "; cmd += key; if (args != NULL){