PERFORCE change 165843 for review
David Forsythe
dforsyth at FreeBSD.org
Thu Jul 9 03:51:33 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=165843
Change 165843 by dforsyth at squirrel on 2009/07/09 03:51:28
fix some headers
Affected files ...
.. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_conflict.c#2 edit
.. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_conflict.h#2 edit
.. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_depend.c#2 edit
.. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_depend.h#2 edit
Differences ...
==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_conflict.c#2 (text+ko) ====
@@ -2,26 +2,30 @@
#include "stdlib.h"
#include "string.h"
-#include <sys/queue.h>
-
#include "pkg_util.h"
-#include "pkg_cfl.h"
+#include "pkg_conflict.h"
#include "pkg.h"
/* Conflicts. */
-struct pkg_cfl *
-pkg_cfl_new()
+struct pkg_conflict *
+pkg_conflict_new()
{
- struct pkg_cfl *pc;
+ struct pkg_conflict *pc;
pc = calloc(1, sizeof(*pc));
return (pc);
}
+void
+pkg_conflict_delete(struct pkg_conflict *pc)
+{
+ return;
+}
+
int
-pkg_cfl_set_name(struct pkg_cfl *pc, const char *name)
+pkg_conflict_set_name(struct pkg_conflict *pc, const char *name)
{
if (pc == NULL)
arg_rage_quit(__func__, "Not a valid conflict.", RAGE_AT_LIBPKG);
@@ -33,7 +37,7 @@
}
const char *
-pkg_cfl_name(struct pkg_cfl *pc)
+pkg_conflict_name(struct pkg_conflict *pc)
{
if (pc == NULL)
arg_rage_quit(__func__, "Not a valid conflict.", RAGE_AT_LIBPKG);
==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_conflict.h#2 (text+ko) ====
@@ -1,17 +1,17 @@
-#ifndef __PKG_CFL_H__
-#define __PKG_CFL_H__
+#ifndef __PKG_CONFLICT_H__
+#define __PKG_CONFLICT_H__
-struct pkg_cfl {
+struct pkg_conflict {
char *name;
int version;
};
-#if 0
-struct pkg_cfl *pkg_cfl_new(void);
+struct pkg_conflict *pkg_conflict_new(void);
+
+void pkg_conflict_delete(struct pkg_conflict *pc);
-int pkg_cfl_set_name(struct pkg_cfl *pc, const char *name);
+int pkg_conflict_set_name(struct pkg_conflict *pc, const char *name);
-const char *pkg_cfl_name(struct pkg_cfl *pc);
-#endif
+const char *pkg_conflict_name(struct pkg_conflict *pc);
#endif
==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_depend.c#2 (text+ko) ====
@@ -2,21 +2,27 @@
#include <stdlib.h>
#include <string.h>
-#include "pkg_dep.h"
+#include "pkg_depend.h"
#include "pkg.h"
-struct pkg_dep *
-pkg_dep_new()
+struct pkg_depend *
+pkg_depend_new()
{
- struct pkg_dep *pd;
+ struct pkg_depend *pd;
pd = calloc(1, sizeof(*pd));
return (pd);
}
-struct pkg_dep *
-pkg_dep_set_name(struct pkg_dep *pd, const char *name)
+void
+pkg_depend_delete(struct pkg_depend *pd)
+{
+ return;
+}
+
+struct pkg_depend *
+pkg_depend_set_name(struct pkg_depend *pd, const char *name)
{
if (pd == NULL)
return (NULL);
@@ -27,8 +33,8 @@
return (pd);
}
-struct pkg_dep *
-pkg_dep_set_origin(struct pkg_dep *pd, const char *origin)
+struct pkg_depend *
+pkg_depend_set_origin(struct pkg_depend *pd, const char *origin)
{
if (pd == NULL)
return (NULL);
@@ -40,7 +46,7 @@
}
const char *
-pkg_dep_name(struct pkg_dep *pd)
+pkg_depend_name(struct pkg_depend *pd)
{
if (pd == NULL)
return (NULL);
@@ -49,7 +55,7 @@
}
const char *
-pkg_dep_origin(struct pkg_dep *pd)
+pkg_depend_origin(struct pkg_depend *pd)
{
if (pd == NULL)
return (NULL);
==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_depend.h#2 (text+ko) ====
@@ -1,27 +1,25 @@
-#ifndef __PKG_DEP_H__
-#define __PKG_DEP_H__
+#ifndef __PKG_DEPEND_H__
+#define __PKG_DEPEND_H__
/* TODO: Clean up pkg_plist.c so I can get this into pkg_dep.c. */
-#include <sys/queue.h>
-
-struct pkg_dep {
+struct pkg_depend {
char *name;
char *origin;
int version;
};
-#if 0
-struct pkg_dep *pkg_dep_new(void);
+struct pkg_depend *pkg_depend_new(void);
+
+void pkg_depend_delete(struct pkg_depend *pd);
-struct pkg_dep *pkg_dep_set_name(struct pkg_dep *pd, const char *name);
+struct pkg_depend *pkg_depend_set_name(struct pkg_depend *pd, const char *name);
-struct pkg_dep *pkg_dep_set_origin(struct pkg_dep *pd, const char *origin);
+struct pkg_depend *pkg_depend_set_origin(struct pkg_depend *pd, const char *origin);
-const char *pkg_dep_name(struct pkg_dep *pd);
+const char *pkg_depend_name(struct pkg_depend *pd);
-const char *pkg_dep_origin(struct pkg_dep *pd);
-#endif
+const char *pkg_depend_origin(struct pkg_depend *pd);
#endif
More information about the p4-projects
mailing list