* LVM2 ./WHATS_NEW include/.symlinks lib/Makefil ...
@ 2007-04-27 18:52 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2007-04-27 18:52 UTC (permalink / raw)
To: lvm-devel
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk at sourceware.org 2007-04-27 19:52:06
Modified files:
. : WHATS_NEW
include : .symlinks
lib : Makefile.in
lib/device : dev-cache.c
lib/filters : filter-regex.c
Removed files:
lib/regex : matcher.c matcher.h parse_rx.c parse_rx.h
ttree.c ttree.h
Log message:
Move regex functions into libdevmapper.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.608&r2=1.609
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/include/.symlinks.diff?cvsroot=lvm2&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.80&r2=1.81
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/device/dev-cache.c.diff?cvsroot=lvm2&r1=1.47&r2=1.48
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/filters/filter-regex.c.diff?cvsroot=lvm2&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/matcher.c.diff?cvsroot=lvm2&r1=1.16&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/matcher.h.diff?cvsroot=lvm2&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/parse_rx.c.diff?cvsroot=lvm2&r1=1.10&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/parse_rx.h.diff?cvsroot=lvm2&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/ttree.c.diff?cvsroot=lvm2&r1=1.11&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/regex/ttree.h.diff?cvsroot=lvm2&r1=1.4&r2=NONE
--- LVM2/WHATS_NEW 2007/04/27 17:46:15 1.608
+++ LVM2/WHATS_NEW 2007/04/27 18:52:05 1.609
@@ -1,5 +1,6 @@
Version 2.02.25 -
=================================
+ Move regex functions into libdevmapper.
Change some #include lines to search only standard system directories.
Add devices/preferred_names config regex list for displayed device names.
Free a temporary dir string in fcntl_lock_file() after use.
--- LVM2/include/.symlinks 2006/08/17 18:23:42 1.43
+++ LVM2/include/.symlinks 2007/04/27 18:52:05 1.44
@@ -43,7 +43,6 @@
../lib/misc/lvm-string.h
../lib/misc/lvm-wrappers.h
../lib/misc/sharedlib.h
-../lib/regex/matcher.h
../lib/report/report.h
../lib/uuid/uuid.h
../po/pogen.h
--- LVM2/lib/Makefile.in 2006/09/30 20:02:02 1.80
+++ LVM2/lib/Makefile.in 2007/04/27 18:52:05 1.81
@@ -81,9 +81,6 @@
misc/lvm-wrappers.c \
misc/timestamp.c \
mm/memlock.c \
- regex/matcher.c \
- regex/parse_rx.c \
- regex/ttree.c \
report/report.c \
striped/striped.c \
uuid/uuid.c \
--- LVM2/lib/device/dev-cache.c 2007/04/26 17:14:57 1.47
+++ LVM2/lib/device/dev-cache.c 2007/04/27 18:52:05 1.48
@@ -19,7 +19,6 @@
#include "btree.h"
#include "filter.h"
#include "filter-persistent.h"
-#include "matcher.h"
#include "toolcontext.h"
#include <unistd.h>
@@ -40,7 +39,7 @@
struct dm_pool *mem;
struct dm_hash_table *names;
struct btree *devices;
- struct matcher *preferred_names_matcher;
+ struct dm_regex *preferred_names_matcher;
int has_scanned;
struct list dirs;
@@ -159,8 +158,8 @@
* FIXME Better to compare patterns one-at-a-time against all names.
*/
if (_cache.preferred_names_matcher) {
- m0 = matcher_run(_cache.preferred_names_matcher, path0);
- m1 = matcher_run(_cache.preferred_names_matcher, path1);
+ m0 = dm_regex_match(_cache.preferred_names_matcher, path0);
+ m1 = dm_regex_match(_cache.preferred_names_matcher, path1);
if (m0 != m1) {
if (m0 < 0)
@@ -526,7 +525,7 @@
}
if (!(_cache.preferred_names_matcher =
- matcher_create(_cache.mem,(const char **) regex, count))) {
+ dm_regex_create(_cache.mem,(const char **) regex, count))) {
log_error("Preferred device name pattern matcher creation failed.");
goto out;
}
--- LVM2/lib/filters/filter-regex.c 2007/04/26 16:44:58 1.21
+++ LVM2/lib/filters/filter-regex.c 2007/04/27 18:52:05 1.22
@@ -15,13 +15,12 @@
#include "lib.h"
#include "filter-regex.h"
-#include "matcher.h"
#include "device.h"
struct rfilter {
struct dm_pool *mem;
dm_bitset_t accept;
- struct matcher *engine;
+ struct dm_regex *engine;
};
static int _extract_pattern(struct dm_pool *mem, const char *pat,
@@ -98,7 +97,7 @@
unsigned count = 0;
int i, r = 0;
- if (!(scratch = dm_pool_create("filter matcher", 1024)))
+ if (!(scratch = dm_pool_create("filter dm_regex", 1024)))
return_0;
/*
@@ -138,8 +137,8 @@
/*
* build the matcher.
*/
- if (!(rf->engine = matcher_create(rf->mem, (const char **) regex,
- count)))
+ if (!(rf->engine = dm_regex_create(rf->mem, (const char **) regex,
+ count)))
stack;
r = 1;
@@ -155,7 +154,7 @@
struct str_list *sl;
list_iterate_items(sl, &dev->aliases) {
- m = matcher_run(rf->engine, sl->str);
+ m = dm_regex_match(rf->engine, sl->str);
if (m >= 0) {
if (dm_bit(rf->accept, m)) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./WHATS_NEW include/.symlinks lib/Makefil ...
@ 2007-07-20 16:01 meyering
0 siblings, 0 replies; 3+ messages in thread
From: meyering @ 2007-07-20 16:01 UTC (permalink / raw)
To: lvm-devel
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: meyering at sourceware.org 2007-07-20 15:48:40
Modified files:
. : WHATS_NEW
include : .symlinks
lib : Makefile.in
lib/misc : lib.h
tools : lvmcmdline.c
tools/fsadm : fsadm.c
Added files:
lib/misc : util.c util.h
Log message:
Eliminate uses of strdup+basename. Use last_path_component instead.
* lib/misc/util.c, lib/misc/util.h (last_path_component): New files.
* lib/Makefile.in (SOURCES): Add misc/util.c.
* lib/misc/lib.h: Include "util.h".
* tools/fsadm/fsadm.c: Include "util.h". (_usage): Use last_path_component,
not basename.
* tools/lvmcmdline.c (_find_command, lvm2_main): Likewise.
* include/.symlinks: Add lib/misc/util.h.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.665&r2=1.666
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/include/.symlinks.diff?cvsroot=lvm2&r1=1.45&r2=1.46
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.81&r2=1.82
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/util.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/util.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lib.h.diff?cvsroot=lvm2&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/fsadm/fsadm.c.diff?cvsroot=lvm2&r1=1.1&r2=1.2
--- LVM2/WHATS_NEW 2007/07/20 15:38:19 1.665
+++ LVM2/WHATS_NEW 2007/07/20 15:48:39 1.666
@@ -1,4 +1,5 @@
Version 2.02.28 -
+ Eliminate uses of strdup+basename. Use last_path_component instead.
Use gcc's printf attribute wherever possible.
In _line_append, use "sizeof buf - 1" rather than equivalent "4095"
Introduce is_same_inode macro, now including a comparison of st_dev.
--- LVM2/include/.symlinks 2007/07/18 15:38:57 1.45
+++ LVM2/include/.symlinks 2007/07/20 15:48:39 1.46
@@ -38,6 +38,7 @@
../lib/misc/configure.h
../lib/misc/crc.h
../lib/misc/intl.h
+../lib/misc/util.h
../lib/misc/lib.h
../lib/misc/lvm-exec.h
../lib/misc/lvm-file.h
--- LVM2/lib/Makefile.in 2007/04/27 18:52:05 1.81
+++ LVM2/lib/Makefile.in 2007/07/20 15:48:39 1.82
@@ -80,6 +80,7 @@
misc/lvm-string.c \
misc/lvm-wrappers.c \
misc/timestamp.c \
+ misc/util.c \
mm/memlock.c \
report/report.c \
striped/striped.c \
/cvs/lvm2/LVM2/lib/misc/util.c,v --> standard output
revision 1.1
--- LVM2/lib/misc/util.c
+++ - 2007-07-20 15:48:40.520121000 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/*
+ * Return the address of the last file name component of NAME.
+ * If NAME ends in a slash, return the empty string.
+ */
+char *last_path_component(char const *name)
+{
+ char const *slash = strrchr (name, '/');
+ char const *res = slash ? slash + 1 : name;
+ return (char *) res;
+}
/cvs/lvm2/LVM2/lib/misc/util.h,v --> standard output
revision 1.1
--- LVM2/lib/misc/util.h
+++ - 2007-07-20 15:48:40.598043000 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef _LVM_UTIL_H
+#define _LVM_UTIL_H
+
+char *last_path_component(char const *name);
+
+#endif
--- LVM2/lib/misc/lib.h 2007/04/27 17:46:16 1.11
+++ LVM2/lib/misc/lib.h 2007/07/20 15:48:39 1.12
@@ -29,6 +29,7 @@
#include "intl.h"
#include "lvm-types.h"
#include "lvm-wrappers.h"
+#include "util.h"
#include <libdevmapper.h>
--- LVM2/tools/lvmcmdline.c 2007/06/28 17:33:44 1.44
+++ LVM2/tools/lvmcmdline.c 2007/07/20 15:48:39 1.45
@@ -479,18 +479,15 @@
static struct command *_find_command(const char *name)
{
int i;
- char *namebase, *base;
+ char *base;
- namebase = strdup(name);
- base = basename(namebase);
+ base = last_path_component(name);
for (i = 0; i < _cmdline.num_commands; i++) {
if (!strcmp(base, _cmdline.commands[i].name))
break;
}
- free(namebase);
-
if (i >= _cmdline.num_commands)
return 0;
@@ -1138,14 +1135,13 @@
int lvm2_main(int argc, char **argv, unsigned is_static)
{
- char *namebase, *base;
+ char *base;
int ret, alias = 0;
struct cmd_context *cmd;
_close_stray_fds();
- namebase = strdup(argv[0]);
- base = basename(namebase);
+ base = last_path_component(argv[0]);
while (*base == '/')
base++;
if (strcmp(base, "lvm") && strcmp(base, "lvm.static") &&
@@ -1160,8 +1156,6 @@
unsetenv("LVM_DID_EXEC");
}
- free(namebase);
-
if (!(cmd = init_lvm(is_static)))
return -1;
--- LVM2/tools/fsadm/fsadm.c 2004/06/15 17:29:20 1.1
+++ LVM2/tools/fsadm/fsadm.c 2007/07/20 15:48:39 1.2
@@ -32,6 +32,8 @@
#include <sys/mount.h>
#include <sys/vfs.h>
+#include "util.h"
+
#define log_error(str, x...) fprintf(stderr, "%s(%u): " str "\n", __FILE__, __LINE__, x)
/* Filesystem related information */
@@ -45,7 +47,7 @@
static void _usage(const char *cmd)
{
log_error("Usage: %s [check <filesystem> | resize <filesystem> <size>]",
- basename(cmd));
+ last_path_component(cmd));
}
/* FIXME Make this more robust - /proc, multiple mounts, TMPDIR + security etc. */
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./WHATS_NEW include/.symlinks lib/Makefil ...
@ 2008-11-03 19:00 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2008-11-03 19:00 UTC (permalink / raw)
To: lvm-devel
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk at sourceware.org 2008-11-03 18:59:59
Modified files:
. : WHATS_NEW
include : .symlinks
lib : Makefile.in
lib/display : display.c
lib/log : lvm-logging.h
lib/misc : lib.h lvm-globals.h
libdm : Makefile.in libdm-common.c libdm-deptree.c
libdm-file.c libdm-report.c libdm-string.c
libdm/datastruct: bitset.c hash.c
libdm/ioctl : libdm-iface.c
libdm/mm : dbg_malloc.c pool-debug.c pool-fast.c pool.c
libdm/regex : matcher.c parse_rx.c ttree.c
Added files:
libdm/misc : dmlib.h
Log message:
more tweaking to get things to compile - dmlib.h for log fns, list.h
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.989&r2=1.990
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/include/.symlinks.diff?cvsroot=lvm2&r1=1.52&r2=1.53
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.86&r2=1.87
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/display/display.c.diff?cvsroot=lvm2&r1=1.92&r2=1.93
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/log/lvm-logging.h.diff?cvsroot=lvm2&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lib.h.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lvm-globals.h.diff?cvsroot=lvm2&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/Makefile.in.diff?cvsroot=lvm2&r1=1.39&r2=1.40
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.60&r2=1.61
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-file.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-report.c.diff?cvsroot=lvm2&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-string.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/bitset.c.diff?cvsroot=lvm2&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/hash.c.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.53&r2=1.54
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/misc/dmlib.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/dbg_malloc.c.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool-debug.c.diff?cvsroot=lvm2&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool-fast.c.diff?cvsroot=lvm2&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/regex/matcher.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/regex/parse_rx.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/regex/ttree.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3
--- LVM2/WHATS_NEW 2008/11/03 16:26:26 1.989
+++ LVM2/WHATS_NEW 2008/11/03 18:59:58 1.990
@@ -1,5 +1,6 @@
Version 2.02.43 -
===================================
+ Move list.c into libdevmapper and rename functions.
Rename a couple of variables that matched function names.
Use simplified x.y.z version number in libdevmapper.pc.
Merge device-mapper into the lvm2 tree.
--- LVM2/include/.symlinks 2008/10/31 22:41:51 1.52
+++ LVM2/include/.symlinks 2008/11/03 18:59:58 1.53
@@ -8,7 +8,6 @@
../lib/config/config.h
../lib/config/defaults.h
../lib/datastruct/btree.h
-../lib/datastruct/list.h
../lib/datastruct/lvm-types.h
../lib/datastruct/str_list.h
../lib/device/dev-cache.h
@@ -52,8 +51,10 @@
../lib/report/report.h
../lib/uuid/uuid.h
../libdm/libdevmapper.h
+../libdm/datastruct/list.h
../libdm/misc/dm-ioctl.h
../libdm/misc/dm-logging.h
+../libdm/misc/dmlib.h
../libdm/misc/kdev_t.h
../po/pogen.h
../tools/version.h
--- LVM2/lib/Makefile.in 2008/10/30 17:27:28 1.86
+++ LVM2/lib/Makefile.in 2008/11/03 18:59:58 1.87
@@ -38,7 +38,6 @@
commands/toolcontext.c \
config/config.c \
datastruct/btree.c \
- datastruct/list.c \
datastruct/str_list.c \
device/dev-cache.c \
device/dev-io.c \
--- LVM2/lib/display/display.c 2008/09/19 06:41:58 1.92
+++ LVM2/lib/display/display.c 2008/11/03 18:59:58 1.93
@@ -572,7 +572,7 @@
void vgdisplay_full(const struct volume_group *vg)
{
- uint32_t access;
+ uint32_t access_str;
uint32_t active_pvs;
uint32_t lv_count = 0;
struct lv_list *lvl;
@@ -589,12 +589,12 @@
list_size(&vg->fid->metadata_areas));
log_print("Metadata Sequence No %d", vg->seqno);
}
- access = vg->status & (LVM_READ | LVM_WRITE);
+ access_str = vg->status & (LVM_READ | LVM_WRITE);
log_print("VG Access %s%s%s%s",
- access == (LVM_READ | LVM_WRITE) ? "read/write" : "",
- access == LVM_READ ? "read" : "",
- access == LVM_WRITE ? "write" : "",
- access == 0 ? "error" : "");
+ access_str == (LVM_READ | LVM_WRITE) ? "read/write" : "",
+ access_str == LVM_READ ? "read" : "",
+ access_str == LVM_WRITE ? "write" : "",
+ access_str == 0 ? "error" : "");
log_print("VG Status %s%sresizable",
vg->status & EXPORTED_VG ? "exported/" : "",
vg->status & RESIZEABLE_VG ? "" : "NOT ");
@@ -658,7 +658,7 @@
uint32_t active_pvs;
uint32_t lv_count;
struct lv_list *lvl;
- const char *access;
+ const char *access_str;
char uuid[64] __attribute((aligned(8)));
active_pvs = vg->pv_count - vg_missing_pv_count(vg);
@@ -669,16 +669,16 @@
switch (vg->status & (LVM_READ | LVM_WRITE)) {
case LVM_READ | LVM_WRITE:
- access = "r/w";
+ access_str = "r/w";
break;
case LVM_READ:
- access = "r";
+ access_str = "r";
break;
case LVM_WRITE:
- access = "w";
+ access_str = "w";
break;
default:
- access = "";
+ access_str = "";
}
if (!id_write_format(&vg->id, uuid, sizeof(uuid))) {
@@ -689,7 +689,7 @@
log_print("%s:%s:%d:-1:%u:%u:%u:-1:%u:%u:%u:%" PRIu64 ":%" PRIu32
":%u:%u:%u:%s",
vg->name,
- access,
+ access_str,
vg->status,
/* internal volume group number; obsolete */
vg->max_lv,
--- LVM2/lib/log/lvm-logging.h 2008/10/30 17:27:27 1.1
+++ LVM2/lib/log/lvm-logging.h 2008/11/03 18:59:58 1.2
@@ -16,8 +16,6 @@
#ifndef _LVM_LOGGING_H
#define _LVM_LOGGING_H
-#include "lvm-globals.h"
-
void print_log(int level, const char *file, int line, const char *format, ...)
__attribute__ ((format(printf, 4, 5)));
--- LVM2/lib/misc/lib.h 2008/11/01 02:19:17 1.15
+++ LVM2/lib/misc/lib.h 2008/11/03 18:59:58 1.16
@@ -27,11 +27,17 @@
#include "intl.h"
#include "libdevmapper.h"
-#include "lvm-logging.h"
-#include "lvm-types.h"
+#include "lvm-globals.h"
#include "lvm-wrappers.h"
+#include "lvm-types.h"
#include "util.h"
+#ifdef DM
+# include "dm-logging.h"
+#else
+# include "lvm-logging.h"
+#endif
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
--- LVM2/lib/misc/lvm-globals.h 2008/10/30 17:40:00 1.1
+++ LVM2/lib/misc/lvm-globals.h 2008/11/03 18:59:58 1.2
@@ -35,7 +35,7 @@
void init_mirror_in_sync(int in_sync);
void init_dmeventd_monitor(int reg);
void init_ignore_suspended_devices(int ignore);
-void init_error_message_produced(int error_message_produced);
+void init_error_message_produced(int produced);
void set_cmd_name(const char *cmd_name);
--- LVM2/libdm/Makefile.in 2008/11/01 02:19:18 1.39
+++ LVM2/libdm/Makefile.in 2008/11/03 18:59:59 1.40
@@ -20,6 +20,7 @@
SOURCES =\
datastruct/bitset.c \
datastruct/hash.c \
+ datastruct/list.c \
libdm-common.c \
libdm-file.c \
libdm-deptree.c \
--- LVM2/libdm/libdm-common.c 2008/11/01 02:19:18 1.60
+++ LVM2/libdm/libdm-common.c 2008/11/03 18:59:59 1.61
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "libdm-targets.h"
#include "libdm-common.h"
#include "list.h"
--- LVM2/libdm/libdm-deptree.c 2008/11/01 02:19:18 1.44
+++ LVM2/libdm/libdm-deptree.c 2008/11/03 18:59:59 1.45
@@ -12,7 +12,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "libdm-targets.h"
#include "libdm-common.h"
#include "list.h"
--- LVM2/libdm/libdm-file.c 2007/08/21 16:26:06 1.9
+++ LVM2/libdm/libdm-file.c 2008/11/03 18:59:59 1.10
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include <sys/file.h>
#include <fcntl.h>
--- LVM2/libdm/libdm-report.c 2008/10/30 17:24:04 1.24
+++ LVM2/libdm/libdm-report.c 2008/11/03 18:59:59 1.25
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include <ctype.h>
--- LVM2/libdm/libdm-string.c 2007/08/21 16:26:06 1.9
+++ LVM2/libdm/libdm-string.c 2008/11/03 18:59:59 1.10
@@ -12,7 +12,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "libdevmapper.h"
#include <ctype.h>
--- LVM2/libdm/datastruct/bitset.c 2007/08/21 16:26:06 1.4
+++ LVM2/libdm/datastruct/bitset.c 2008/11/03 18:59:59 1.5
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
/* FIXME: calculate this. */
#define INT_SHIFT 5
--- LVM2/libdm/datastruct/hash.c 2008/05/21 16:14:45 1.8
+++ LVM2/libdm/datastruct/hash.c 2008/11/03 18:59:59 1.9
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
struct dm_hash_node {
struct dm_hash_node *next;
--- LVM2/libdm/ioctl/libdm-iface.c 2008/11/01 02:19:18 1.53
+++ LVM2/libdm/ioctl/libdm-iface.c 2008/11/03 18:59:59 1.54
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "libdm-targets.h"
#include "libdm-common.h"
/cvs/lvm2/LVM2/libdm/misc/dmlib.h,v --> standard output
revision 1.1
--- LVM2/libdm/misc/dmlib.h
+++ - 2008-11-03 19:00:02.251494000 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+ * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/*
+ * This file must be included first by every device-mapper library source file.
+ */
+#ifndef _DM_LIB_H
+#define _DM_LIB_H
+
+#define DM
+
+#include "lib.h"
+
+#endif
--- LVM2/libdm/mm/dbg_malloc.c 2008/06/25 14:10:33 1.12
+++ LVM2/libdm/mm/dbg_malloc.c 2008/11/03 18:59:59 1.13
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include <assert.h>
#include <stdarg.h>
--- LVM2/libdm/mm/pool-debug.c 2008/04/19 15:50:18 1.4
+++ LVM2/libdm/mm/pool-debug.c 2008/11/03 18:59:59 1.5
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
struct block {
struct block *next;
--- LVM2/libdm/mm/pool-fast.c 2008/04/19 15:50:18 1.5
+++ LVM2/libdm/mm/pool-fast.c 2008/11/03 18:59:59 1.6
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
struct chunk {
char *begin, *end;
--- LVM2/libdm/mm/pool.c 2007/08/21 16:26:07 1.3
+++ LVM2/libdm/mm/pool.c 2008/11/03 18:59:59 1.4
@@ -13,6 +13,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "dmlib.h"
+
#ifdef DEBUG_POOL
#include "pool-debug.c"
#else
--- LVM2/libdm/regex/matcher.c 2007/08/21 16:26:07 1.2
+++ LVM2/libdm/regex/matcher.c 2008/11/03 18:59:59 1.3
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "parse_rx.h"
#include "ttree.h"
#include "assert.h"
--- LVM2/libdm/regex/parse_rx.c 2007/08/21 16:26:07 1.2
+++ LVM2/libdm/regex/parse_rx.c 2008/11/03 18:59:59 1.3
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "parse_rx.h"
struct parse_sp { /* scratch pad for the parsing process */
--- LVM2/libdm/regex/ttree.c 2007/08/21 16:26:07 1.2
+++ LVM2/libdm/regex/ttree.c 2008/11/03 18:59:59 1.3
@@ -13,7 +13,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "lib.h"
+#include "dmlib.h"
#include "ttree.h"
struct node {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-11-03 19:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-27 18:52 LVM2 ./WHATS_NEW include/.symlinks lib/Makefil agk
-- strict thread matches above, loose matches on Subject: below --
2007-07-20 16:01 meyering
2008-11-03 19:00 agk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.