<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13276] twext/trunk/twext/python/launchd.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13276">13276</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 11:24:04 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lint</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextpythonlaunchdpy">twext/trunk/twext/python/launchd.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextpythonlaunchdpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/launchd.py (13275 => 13276)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/launchd.py 2014-04-15 17:51:29 UTC (rev 13275)
+++ twext/trunk/twext/python/launchd.py 2014-04-15 18:24:04 UTC (rev 13276)
</span><span class="lines">@@ -35,66 +35,77 @@
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><span class="cx"> from cffi import FFI, VerificationError
</span><ins>+from textwrap import dedent
</ins><span class="cx">
</span><span class="cx"> ffi = FFI()
</span><span class="cx">
</span><del>-ffi.cdef("""
</del><ins>+ffi.cdef(dedent(
+ """
+ static const char* LAUNCH_KEY_CHECKIN;
+ static const char* LAUNCH_JOBKEY_LABEL;
+ static const char* LAUNCH_JOBKEY_SOCKETS;
</ins><span class="cx">
</span><del>-static const char* LAUNCH_KEY_CHECKIN;
-static const char* LAUNCH_JOBKEY_LABEL;
-static const char* LAUNCH_JOBKEY_SOCKETS;
</del><ins>+ typedef enum {
+ LAUNCH_DATA_DICTIONARY = 1,
+ LAUNCH_DATA_ARRAY,
+ LAUNCH_DATA_FD,
+ LAUNCH_DATA_INTEGER,
+ LAUNCH_DATA_REAL,
+ LAUNCH_DATA_BOOL,
+ LAUNCH_DATA_STRING,
+ LAUNCH_DATA_OPAQUE,
+ LAUNCH_DATA_ERRNO,
+ LAUNCH_DATA_MACHPORT,
+ } launch_data_type_t;
</ins><span class="cx">
</span><del>-typedef enum {
- LAUNCH_DATA_DICTIONARY = 1,
- LAUNCH_DATA_ARRAY,
- LAUNCH_DATA_FD,
- LAUNCH_DATA_INTEGER,
- LAUNCH_DATA_REAL,
- LAUNCH_DATA_BOOL,
- LAUNCH_DATA_STRING,
- LAUNCH_DATA_OPAQUE,
- LAUNCH_DATA_ERRNO,
- LAUNCH_DATA_MACHPORT,
-} launch_data_type_t;
</del><ins>+ typedef struct _launch_data *launch_data_t;
</ins><span class="cx">
</span><del>-typedef struct _launch_data *launch_data_t;
</del><ins>+ bool launch_data_dict_insert(
+ launch_data_t, const launch_data_t, const char *
+ );
</ins><span class="cx">
</span><del>-bool launch_data_dict_insert(launch_data_t, const launch_data_t, const char *);
</del><ins>+ launch_data_t launch_data_alloc(launch_data_type_t);
+ launch_data_t launch_data_new_string(const char *);
+ launch_data_t launch_data_new_integer(long long);
+ launch_data_t launch_data_new_fd(int);
+ launch_data_t launch_data_new_bool(bool);
+ launch_data_t launch_data_new_real(double);
+ launch_data_t launch_msg(const launch_data_t);
</ins><span class="cx">
</span><del>-launch_data_t launch_data_alloc(launch_data_type_t);
-launch_data_t launch_data_new_string(const char *);
-launch_data_t launch_data_new_integer(long long);
-launch_data_t launch_data_new_fd(int);
-launch_data_t launch_data_new_bool(bool);
-launch_data_t launch_data_new_real(double);
-launch_data_t launch_msg(const launch_data_t);
</del><ins>+ launch_data_type_t launch_data_get_type(const launch_data_t);
</ins><span class="cx">
</span><del>-launch_data_type_t launch_data_get_type(const launch_data_t);
</del><ins>+ launch_data_t launch_data_dict_lookup(const launch_data_t, const char *);
+ size_t launch_data_dict_get_count(const launch_data_t);
+ long long launch_data_get_integer(const launch_data_t);
+ void launch_data_dict_iterate(
+ const launch_data_t, void (*)(
+ const launch_data_t, const char *, void *
+ ),
+ void *
+ );
</ins><span class="cx">
</span><del>-launch_data_t launch_data_dict_lookup(const launch_data_t, const char *);
-size_t launch_data_dict_get_count(const launch_data_t);
-long long launch_data_get_integer(const launch_data_t);
-void launch_data_dict_iterate(
- const launch_data_t, void (*)(const launch_data_t, const char *, void *),
- void *);
</del><ins>+ int launch_data_get_fd(const launch_data_t);
+ bool launch_data_get_bool(const launch_data_t);
+ const char * launch_data_get_string(const launch_data_t);
+ double launch_data_get_real(const launch_data_t);
</ins><span class="cx">
</span><del>-int launch_data_get_fd(const launch_data_t);
-bool launch_data_get_bool(const launch_data_t);
-const char * launch_data_get_string(const launch_data_t);
-double launch_data_get_real(const launch_data_t);
</del><ins>+ size_t launch_data_array_get_count(const launch_data_t);
+ launch_data_t launch_data_array_get_index(const launch_data_t, size_t);
+ bool launch_data_array_set_index(
+ launch_data_t, const launch_data_t, size_t
+ );
</ins><span class="cx">
</span><del>-size_t launch_data_array_get_count(const launch_data_t);
-launch_data_t launch_data_array_get_index(const launch_data_t, size_t);
-bool launch_data_array_set_index(launch_data_t, const launch_data_t, size_t);
</del><ins>+ void launch_data_free(launch_data_t);
+ """
+))
</ins><span class="cx">
</span><del>-void launch_data_free(launch_data_t);
-""")
-
</del><span class="cx"> try:
</span><del>- lib = ffi.verify("""
- #include <launch.h>
- """,
- tag=__name__.replace(".", "_"))
</del><ins>+ lib = ffi.verify(
+ """
+ #include <launch.h>
+ """,
+ tag=__name__.replace(".", "_")
+ )
</ins><span class="cx"> except VerificationError as ve:
</span><span class="cx"> raise ImportError(ve)
</span><span class="cx">
</span><span class="lines">@@ -128,9 +139,11 @@
</span><span class="cx"> Return keys in the dictionary.
</span><span class="cx"> """
</span><span class="cx"> keys = []
</span><ins>+
</ins><span class="cx"> @ffi.callback("void (*)(const launch_data_t, const char *, void *)")
</span><span class="cx"> def icb(v, k, n):
</span><span class="cx"> keys.append(ffi.string(k))
</span><ins>+
</ins><span class="cx"> lib.launch_data_dict_iterate(self.launchdata, icb, ffi.NULL)
</span><span class="cx"> return keys
</span><span class="cx">
</span><span class="lines">@@ -140,9 +153,11 @@
</span><span class="cx"> Return values in the dictionary.
</span><span class="cx"> """
</span><span class="cx"> values = []
</span><ins>+
</ins><span class="cx"> @ffi.callback("void (*)(const launch_data_t, const char *, void *)")
</span><span class="cx"> def icb(v, k, n):
</span><span class="cx"> values.append(_launchify(v))
</span><ins>+
</ins><span class="cx"> lib.launch_data_dict_iterate(self.launchdata, icb, ffi.NULL)
</span><span class="cx"> return values
</span><span class="cx">
</span><span class="lines">@@ -152,9 +167,11 @@
</span><span class="cx"> Return items in the dictionary.
</span><span class="cx"> """
</span><span class="cx"> values = []
</span><ins>+
</ins><span class="cx"> @ffi.callback("void (*)(const launch_data_t, const char *, void *)")
</span><span class="cx"> def icb(v, k, n):
</span><span class="cx"> values.append((ffi.string(k), _launchify(v)))
</span><ins>+
</ins><span class="cx"> lib.launch_data_dict_iterate(self.launchdata, icb, ffi.NULL)
</span><span class="cx"> return values
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>