From: Stéphane Graber Date: Wed, 18 Sep 2013 19:40:20 +0000 (-0500) Subject: Remove trailing whitespaces X-Git-Tag: lxc-1.0.0.alpha2~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8900b9eb2514c07047541833286428572493a9fd;p=thirdparty%2Flxc.git Remove trailing whitespaces Signed-off-by: Stéphane Graber --- diff --git a/doc/ja/common_options.sgml.in b/doc/ja/common_options.sgml.in index efaf92fcc..77c4639bb 100644 --- a/doc/ja/common_options.sgml.in +++ b/doc/ja/common_options.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> @@ -110,7 +110,7 @@ by KATOH Yasufumi NOTICE, INFO, DEBUG. --> - ログの優先度を LEVEL に設定します．デフォルトの優先度は ERROR です．以下の値を設定可能です: + ログの優先度を LEVEL に設定します．デフォルトの優先度は ERROR です．以下の値を設定可能です: FATAL, CRIT, WARN, ERROR, NOTICE, INFO, diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in index 9d548faef..9fa14cad1 100644 --- a/doc/ja/lxc-attach.sgml.in +++ b/doc/ja/lxc-attach.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-cgroup.sgml.in b/doc/ja/lxc-cgroup.sgml.in index 9c0198287..45cf6e62d 100644 --- a/doc/ja/lxc-cgroup.sgml.in +++ b/doc/ja/lxc-cgroup.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-checkconfig.sgml.in b/doc/ja/lxc-checkconfig.sgml.in index e01db3944..4e0ac44b8 100644 --- a/doc/ja/lxc-checkconfig.sgml.in +++ b/doc/ja/lxc-checkconfig.sgml.in @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-checkpoint.sgml.in b/doc/ja/lxc-checkpoint.sgml.in index 930ece1a2..7308120d8 100644 --- a/doc/ja/lxc-checkpoint.sgml.in +++ b/doc/ja/lxc-checkpoint.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-clone.sgml.in b/doc/ja/lxc-clone.sgml.in index 8feda06d1..7c642871e 100644 --- a/doc/ja/lxc-clone.sgml.in +++ b/doc/ja/lxc-clone.sgml.in @@ -22,7 +22,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-console.sgml.in b/doc/ja/lxc-console.sgml.in index 0384f51ad..4d69aff48 100644 --- a/doc/ja/lxc-console.sgml.in +++ b/doc/ja/lxc-console.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-create.sgml.in b/doc/ja/lxc-create.sgml.in index 25b70d28c..9713abded 100644 --- a/doc/ja/lxc-create.sgml.in +++ b/doc/ja/lxc-create.sgml.in @@ -1,4 +1,4 @@ - @@ -160,7 +160,7 @@ by KATOH Yasufumi The option 'btrfs' need not be specified as it will be used automatically if the @LXCPATH@ filesystem is found to be btrfs. If backingstore is 'lvm', then an lvm block device will be - used and the following further options are available: + used and the following further options are available: --lvname lvname1 will create an LV named lvname1 rather than the default, which is the container name. --vgname vgname1 @@ -169,7 +169,7 @@ by KATOH Yasufumi --fstype FSTYPE will create an FSTYPE filesystem on the LV, rather than the default, which is ext4. --fssize SIZE will create a LV (and - filesystem) of size SIZE rather than the default, which is 1G. + filesystem) of size SIZE rather than the default, which is 1G. --> backingstore には 'none' か 'dir' か 'lvm' か 'btrfs' のいずれかを指定します．デフォルトは 'none' で，コンテナのルートファイルシステムが @LXCPATH@/container/rootfs 以下のディレクトリであることを意味します． 'dir' は 'none' と同じ意味ですが，オプションとして --dir ROOTFS を指定することも可能です．このオプションは，デフォルトの代わりに特定のパス以下にコンテナの rootfs を置くということになります． @@ -217,7 +217,7 @@ by KATOH Yasufumi メッセージの通り，コンテナを作成しようとしたけれども，同じ名前のコンテナが存在しています．lxc-ls -l コマンドを使って，システム上に存在する利用可能なコンテナのリストが表示できます． - + diff --git a/doc/ja/lxc-destroy.sgml.in b/doc/ja/lxc-destroy.sgml.in index 5483cbe26..e82bcfb91 100644 --- a/doc/ja/lxc-destroy.sgml.in +++ b/doc/ja/lxc-destroy.sgml.in @@ -1,4 +1,4 @@ - @@ -128,7 +128,7 @@ by KATOH Yasufumi 破壊するために指定したコンテナが見つかりません．おそらくそのコンテナが存在しないのか，既に破壊された後なのでしょう．lxc-ls -l コマンドを使って，システム上に存在するコンテナのリストを得ることができます． - + diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-device.sgml.in index 9ab066399..d46582e46 100644 --- a/doc/ja/lxc-device.sgml.in +++ b/doc/ja/lxc-device.sgml.in @@ -1,4 +1,3 @@ - diff --git a/doc/ja/lxc-execute.sgml.in b/doc/ja/lxc-execute.sgml.in index 397392c60..ec016fbc6 100644 --- a/doc/ja/lxc-execute.sgml.in +++ b/doc/ja/lxc-execute.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-freeze.sgml.in b/doc/ja/lxc-freeze.sgml.in index f1d1f14cc..84d09160b 100644 --- a/doc/ja/lxc-freeze.sgml.in +++ b/doc/ja/lxc-freeze.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-info.sgml.in b/doc/ja/lxc-info.sgml.in index 829133cea..1c7a7b439 100644 --- a/doc/ja/lxc-info.sgml.in +++ b/doc/ja/lxc-info.sgml.in @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-kill.sgml.in b/doc/ja/lxc-kill.sgml.in index 0e877fbff..0cf924d00 100644 --- a/doc/ja/lxc-kill.sgml.in +++ b/doc/ja/lxc-kill.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-ls.sgml.in b/doc/ja/lxc-ls.sgml.in index fabd422b4..3b3e3d55f 100644 --- a/doc/ja/lxc-ls.sgml.in +++ b/doc/ja/lxc-ls.sgml.in @@ -1,5 +1,4 @@ - - @@ -249,7 +248,7 @@ by KATOH Yasufumi See Also - + ls 1 diff --git a/doc/ja/lxc-monitor.sgml.in b/doc/ja/lxc-monitor.sgml.in index f41592389..ba54e4929 100644 --- a/doc/ja/lxc-monitor.sgml.in +++ b/doc/ja/lxc-monitor.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-netstat.sgml.in b/doc/ja/lxc-netstat.sgml.in index 4361ec61c..7b5f7f293 100644 --- a/doc/ja/lxc-netstat.sgml.in +++ b/doc/ja/lxc-netstat.sgml.in @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-ps.sgml.in b/doc/ja/lxc-ps.sgml.in index e55df4ba4..739a8a321 100644 --- a/doc/ja/lxc-ps.sgml.in +++ b/doc/ja/lxc-ps.sgml.in @@ -1,5 +1,4 @@ - - @@ -104,7 +103,7 @@ by KATOH Yasufumi name で指定したコンテナに属するプロセスのみ出力する． @@ -118,7 +117,7 @@ by KATOH Yasufumi 全ての lxc コンテナに属するプロセスを出力する． diff --git a/doc/ja/lxc-restart.sgml.in b/doc/ja/lxc-restart.sgml.in index 5f2447574..edc845a94 100644 --- a/doc/ja/lxc-restart.sgml.in +++ b/doc/ja/lxc-restart.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-shutdown.sgml.in b/doc/ja/lxc-shutdown.sgml.in index faa5b0de5..c2b5d61b0 100644 --- a/doc/ja/lxc-shutdown.sgml.in +++ b/doc/ja/lxc-shutdown.sgml.in @@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-start-ephemeral.sgml.in b/doc/ja/lxc-start-ephemeral.sgml.in index 08a93b3aa..8fd5c16c7 100644 --- a/doc/ja/lxc-start-ephemeral.sgml.in +++ b/doc/ja/lxc-start-ephemeral.sgml.in @@ -20,7 +20,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-start.sgml.in b/doc/ja/lxc-start.sgml.in index 2119bf1ac..d1bde1715 100644 --- a/doc/ja/lxc-start.sgml.in +++ b/doc/ja/lxc-start.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-stop.sgml.in b/doc/ja/lxc-stop.sgml.in index 6efec5f7f..f2c39287b 100644 --- a/doc/ja/lxc-stop.sgml.in +++ b/doc/ja/lxc-stop.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/lxc-unfreeze.sgml.in b/doc/ja/lxc-unfreeze.sgml.in index 026a75889..a7fd96495 100644 --- a/doc/ja/lxc-unfreeze.sgml.in +++ b/doc/ja/lxc-unfreeze.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-unshare.sgml.in b/doc/ja/lxc-unshare.sgml.in index f397e8856..6a836d3e2 100644 --- a/doc/ja/lxc-unshare.sgml.in +++ b/doc/ja/lxc-unshare.sgml.in @@ -22,7 +22,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-version.sgml.in b/doc/ja/lxc-version.sgml.in index 2aaf77fb2..f23cb4fff 100644 --- a/doc/ja/lxc-version.sgml.in +++ b/doc/ja/lxc-version.sgml.in @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/doc/ja/lxc-wait.sgml.in b/doc/ja/lxc-wait.sgml.in index e6f7a0e2a..57db14943 100644 --- a/doc/ja/lxc-wait.sgml.in +++ b/doc/ja/lxc-wait.sgml.in @@ -1,5 +1,4 @@ - - diff --git a/doc/ja/lxc.conf.sgml.in b/doc/ja/lxc.conf.sgml.in index 607bd903f..005e338dc 100644 --- a/doc/ja/lxc.conf.sgml.in +++ b/doc/ja/lxc.conf.sgml.in @@ -1,4 +1,4 @@ - @@ -322,7 +322,7 @@ by KATOH Yasufumi --> ネットワークに対して行うアクションを指定します． - + コンテナでゲートウェイとして使う IPv6 アドレスを指定します．アドレスは x::y というフォーマットです．例えば，2003:db8:1:0::1． - + という特別な値を記述する事も可能です．これは ( で指定した) ブリッジインターフェースの最初のアドレスを使用し，それをゲートウェイに使うという意味になります． はネットワークタイプとして と を指定している時だけ有効となります． diff --git a/doc/ja/lxc.sgml.in b/doc/ja/lxc.sgml.in index b6c8a9a3b..dc885ca0c 100644 --- a/doc/ja/lxc.sgml.in +++ b/doc/ja/lxc.sgml.in @@ -1,4 +1,4 @@ - diff --git a/doc/ja/see_also.sgml.in b/doc/ja/see_also.sgml.in index 461f623cc..5c635ce56 100644 --- a/doc/ja/see_also.sgml.in +++ b/doc/ja/see_also.sgml.in @@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Translated into Japanese +Translated into Japanese by KATOH Yasufumi --> diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c index fe1a4c357..1270b8a54 100644 --- a/src/lxc/cgroup.c +++ b/src/lxc/cgroup.c @@ -167,7 +167,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist) tab1 = strchr(line, '\t'); if (!tab1) - continue; + continue; *tab1++ = '\0'; tab2 = strchr(tab1, '\t'); if (!tab2) @@ -223,7 +223,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist) colon1 = strchr(line, ':'); if (!colon1) - continue; + continue; *colon1++ = '\0'; colon2 = strchr(colon1, ':'); if (!colon2) @@ -319,7 +319,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist) * 1: parent id * 2: device major:minor * 3: mount prefix - * 4: mount point + * 4: mount point * 5: per-mount options * [optional X]: additional data * X+7: "-" @@ -1052,7 +1052,7 @@ char *lxc_cgroup_get_hierarchy_abs_path_handler(const char *subsystem, struct lx if (!info) return NULL; if (info->designated_mount_point) { - mp = info->designated_mount_point; + mp = info->designated_mount_point; } else { mp = lxc_cgroup_find_mount_point(info->hierarchy, info->cgroup_path, true); if (!mp) @@ -1079,7 +1079,7 @@ char *lxc_cgroup_get_hierarchy_abs_path(const char *subsystem, const char *name, if (!info) return NULL; if (info->designated_mount_point) { - mp = info->designated_mount_point; + mp = info->designated_mount_point; } else { mp = lxc_cgroup_find_mount_point(info->hierarchy, info->cgroup_path, true); if (!mp) @@ -1175,7 +1175,7 @@ int lxc_cgroup_get(const char *filename, char *value, size_t len, const char *na * will be returned * @name : name of container to connect to * @lxcpath : the lxcpath in which the container is running - * + * * This is the exported function, which determines cgpath from the * lxc-start of the @name container running in @lxcpath. * @@ -1354,7 +1354,7 @@ int lxc_cgroup_nrtasks_handler(struct lxc_handler *handler) } if (info->designated_mount_point) { - mp = info->designated_mount_point; + mp = info->designated_mount_point; } else { mp = lxc_cgroup_find_mount_point(info->hierarchy, info->cgroup_path, false); if (!mp) @@ -1402,7 +1402,7 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg colon1 = strchr(line, ':'); if (!colon1) - continue; + continue; *colon1++ = '\0'; colon2 = strchr(colon1, ':'); if (!colon2) @@ -1476,7 +1476,7 @@ char **subsystems_from_mount_options(const char *mount_options, char **kernel_li char *token, *str, *saveptr = NULL; char **result = NULL; size_t result_capacity = 0; - size_t result_count = 0; + size_t result_count = 0; int saved_errno; int r; @@ -1595,10 +1595,10 @@ char *cgroup_to_absolute_path(struct cgroup_mount_point *mp, const char *path, c len = strlen(mp->mount_point) + strlen(path) + (suffix ? strlen(suffix) : 0); buf = calloc(len + 1, 1); rv = snprintf(buf, len + 1, "%s%s%s", mp->mount_point, path, suffix ? suffix : ""); - if (rv > len) { + if (rv > len) { free(buf); errno = ENOMEM; - return NULL; + return NULL; } return buf; @@ -1697,7 +1697,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a { char *path; FILE *devices_list; - char *line = NULL; + char *line = NULL; size_t sz = 0; bool ret = !for_allow; const char *parts[3] = { @@ -1738,7 +1738,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a goto out; } else if (for_allow && strcmp(line, v) == 0) { ret = true; - goto out; + goto out; } } @@ -1756,7 +1756,7 @@ int cgroup_recursive_task_count(const char *cgroup_path) DIR *d; struct dirent *dent_buf; struct dirent *dent; - ssize_t name_max; + ssize_t name_max; int n = 0, r; /* see man readdir_r(3) */ @@ -1820,7 +1820,7 @@ int cgroup_recursive_task_count(const char *cgroup_path) return n; } -int count_lines(const char *fn) +int count_lines(const char *fn) { FILE *f; char *line = NULL; diff --git a/src/lxc/cgroup.h b/src/lxc/cgroup.h index ad9d596f0..5f517f666 100644 --- a/src/lxc/cgroup.h +++ b/src/lxc/cgroup.h @@ -146,7 +146,7 @@ extern int lxc_cgroup_get(const char *filename, char *value, size_t len, const c * will be returned * @name : name of container to connect to * @lxcpath : the lxcpath in which the container is running - * + * * This is the exported function, which determines cgpath from the * lxc-start of the @name container running in @lxcpath. * diff --git a/src/lxc/commands.c b/src/lxc/commands.c index f481a55ce..7c538c6d5 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -404,7 +404,7 @@ static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req, if (req->datalen < 1) return -1; - + path = lxc_cgroup_get_hierarchy_path_handler(req->data, handler); if (!path) return -1;